diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index 923f8f08ac..7ecbeffcf8 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -1192,8 +1192,6 @@ public class Blocklist {
      *
      *  Public for console only, not a public API
      *
-     *  @param max maximum entries to return
-     *  @return sorted
      *  @since 0.9.48
      */
     public synchronized int getBlocklistSize() {
diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java
index c7d7be30eb..dc653457c9 100644
--- a/router/java/src/net/i2p/router/StatisticsManager.java
+++ b/router/java/src/net/i2p/router/StatisticsManager.java
@@ -47,7 +47,9 @@ public class StatisticsManager {
         _fmt = new DecimalFormat("###,##0.00", new DecimalFormatSymbols(Locale.UK));
         _pct = new DecimalFormat("#0.00%", new DecimalFormatSymbols(Locale.UK));
         _log = context.logManager().getLog(StatisticsManager.class);
-        _networkID = Integer.toString(context.router().getNetworkID());
+        // null for some tests
+        Router r = context.router();
+        _networkID = r != null ? Integer.toString(r.getNetworkID()) : "2";
     }
         
     /**
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index 3b87d8b95f..fc94b17b8b 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -582,7 +582,7 @@ class ClientManager {
         } else {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Cannot request the lease set, as we can't find a client runner for " 
-                          + dest + ".  disconnected?");
+                          + dest.toBase32() + ".  disconnected?");
         }
     }
     
@@ -677,12 +677,12 @@ class ClientManager {
         if (runner != null) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Delivering status " + status + " to " 
-                           + fromDest.calculateHash() + " for message " + id);
+                           + fromDest.toBase32() + " for message " + id);
             runner.updateMessageDeliveryStatus(fromDest, id, messageNonce, status);
         } else {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Cannot deliver status " + status + " to " 
-                          + fromDest.calculateHash() + " for message " + id);
+                          + fromDest.toBase32() + " for message " + id);
         }
     }
     
@@ -799,7 +799,7 @@ class ClientManager {
                 // we should pool these somewhere...
                 if (_log.shouldLog(Log.WARN))
                     _log.warn("Message received but we don't have a connection to " 
-                              + dest + "/" + _msg.getDestinationHash() 
+                              + dest + "/" + _msg.getDestinationHash().toBase32()
                               + " currently.  DROPPED", new Exception());
             }
         }
diff --git a/router/java/src/net/i2p/router/client/MessageReceivedJob.java b/router/java/src/net/i2p/router/client/MessageReceivedJob.java
index 1fd9651b0f..3f72d9f526 100644
--- a/router/java/src/net/i2p/router/client/MessageReceivedJob.java
+++ b/router/java/src/net/i2p/router/client/MessageReceivedJob.java
@@ -71,7 +71,7 @@ class MessageReceivedJob extends JobImpl {
             }
             return true;
         } catch (I2CPMessageException ime) {
-            String msg = "Error sending data to client " + _runner.getDestHash();
+            String msg = "Error sending data to client " + _runner.getDestHash().toBase32();
             if (_log.shouldWarn())
                 _log.warn(msg, ime);
             else
@@ -94,7 +94,7 @@ class MessageReceivedJob extends JobImpl {
         SessionId sid = _runner.getSessionId(_toDest.calculateHash());
         if (sid == null) {
             if (_log.shouldLog(Log.WARN))
-                _log.warn("No session for " + _toDest.calculateHash());
+                _log.warn("No session for " + _toDest.toBase32());
             return;
         }
         msg.setSessionId(sid.getSessionId());
@@ -115,7 +115,7 @@ class MessageReceivedJob extends JobImpl {
         SessionId sid = _runner.getSessionId(_toDest.calculateHash());
         if (sid == null) {
             if (_log.shouldLog(Log.WARN))
-                _log.warn("No session for " + _toDest.calculateHash());
+                _log.warn("No session for " + _toDest.toBase32());
             return;
         }
         msg.setSessionId(sid.getSessionId());
diff --git a/router/java/src/net/i2p/router/crypto/ratchet/SessionKeyAndNonce.java b/router/java/src/net/i2p/router/crypto/ratchet/SessionKeyAndNonce.java
index 769c919257..e2a8bc2de3 100644
--- a/router/java/src/net/i2p/router/crypto/ratchet/SessionKeyAndNonce.java
+++ b/router/java/src/net/i2p/router/crypto/ratchet/SessionKeyAndNonce.java
@@ -85,7 +85,8 @@ class SessionKeyAndNonce extends SessionKey {
     public String toString() {
         StringBuilder buf = new StringBuilder(64);
         buf.append("[SessionKeyAndNonce: ");
-        buf.append(toBase64());
+        if (_data != null)
+            buf.append(toBase64());
         buf.append(_state != null ? " NSR" : " ES");
         buf.append(" nonce: ").append(_nonce);
         buf.append(']');
diff --git a/router/java/src/net/i2p/router/message/CloveSet.java b/router/java/src/net/i2p/router/message/CloveSet.java
index 19e5c8d6e8..f85e5cd8b6 100644
--- a/router/java/src/net/i2p/router/message/CloveSet.java
+++ b/router/java/src/net/i2p/router/message/CloveSet.java
@@ -9,6 +9,7 @@ package net.i2p.router.message;
  */
 
 import net.i2p.data.Certificate;
+import net.i2p.data.DataHelper;
 import net.i2p.data.i2np.GarlicClove;
 
 /**
@@ -47,15 +48,21 @@ public class CloveSet {
     @Override
     public String toString() { 
 	StringBuilder buf = new StringBuilder(128);
-	buf.append("{");
+	buf.append("CloveSet: id ").append(_msgId)
+           .append(' ').append(_cert)
+           .append(" expires " ).append(DataHelper.formatTime(_expiration))
+           .append(" cloves: " ).append(_cloves.length)
+	   .append(" {");
 	for (int i = 0; i < _cloves.length; i++) {
 	    GarlicClove clove = _cloves[i];
 	    if (clove.getData() != null)
-		buf.append(clove.getData().getClass().getName()).append(", ");
+		buf.append(clove.getData().getClass().getSimpleName());
 	    else
-		buf.append("[null clove], ");
+		buf.append("[null clove]");
+            if (i < _cloves.length - 1)
+		buf.append(", ");
 	}
-	buf.append("}");
+	buf.append('}');
 	return buf.toString();
     }
 }