diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java
index 4929024acbb2a2444834d86bd674386fc93eff4c..c758f692b1afab4b5d9aa365218af64aaefcb610 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java
@@ -116,7 +116,7 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
      * @param buf data to be sent - may be null
      * @param off offset into the buffer to start writing from
      * @param size how many bytes of the buffer to write (may be 0)
-     * @return the packet sent, or null if the connection died
+     * @return the packet sent
      */
     public PacketLocal send(byte buf[], int off, int size) {
         return send(buf, off, size, false);
diff --git a/core/java/src/net/i2p/util/Clock.java b/core/java/src/net/i2p/util/Clock.java
index 5cba4684e8f3ba226e4817f30c59e2112e8a48b4..c8587f48eb4ffe3259e021e89216bf71b42495ff 100644
--- a/core/java/src/net/i2p/util/Clock.java
+++ b/core/java/src/net/i2p/util/Clock.java
@@ -113,7 +113,7 @@ public class Clock implements Timestamper.UpdateListener {
     /*
      * @return the current delta from System.currentTimeMillis() in milliseconds
      */
-    public synchronized long getOffset() {
+    public long getOffset() {
         return _offset;
     }
     
diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java
index a63b4ef056a31789b38d51152721486e7f737590..3016dadd6ee82856c5b53b6cb9e6c45cb62237f4 100644
--- a/router/java/src/net/i2p/router/TunnelPoolSettings.java
+++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java
@@ -283,6 +283,7 @@ public class TunnelPoolSettings {
     }
     
     private static final boolean getBoolean(String str, boolean defaultValue) { 
+        if (str == null) return defaultValue;
         boolean v = Boolean.parseBoolean(str) ||
                     (str != null && "YES".equals(str.toUpperCase(Locale.US)));
         return v;