diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java
index 7730b1ef7..43c86e34d 100644
--- a/router/java/src/net/i2p/router/Shitlist.java
+++ b/router/java/src/net/i2p/router/Shitlist.java
@@ -59,7 +59,7 @@ public class Shitlist {
             wasAlready = (null == oldDate);
         }
         
-        _context.netDb().fail(peer);
+        //_context.netDb().fail(peer);
         _context.tunnelManager().peerFailed(peer);
         return wasAlready;
     }
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
index 87e088ad3..91732bf4b 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
@@ -32,7 +32,7 @@ class ExpireRoutersJob extends JobImpl {
     private Log _log;
     private KademliaNetworkDatabaseFacade _facade;
     
-    private final static long RERUN_DELAY_MS = 30*1000;
+    private final static long RERUN_DELAY_MS = 120*1000;
     /**
      * If a routerInfo structure isn't updated within an hour, drop it
      * and search for a later version.  This value should be large enough
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 2ce511ffc..0eff865d0 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -506,13 +506,15 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
         if (isRouterInfo) {
             int remaining = _kb.size();
             if (remaining < MIN_REMAINING_ROUTERS) {
-                _log.warn("Not removing " + dbEntry + " because we have so few routers left ("
-                + remaining + ") - perhaps a reseed is necessary?");
+                if (_log.shouldLog(Log.ERROR))
+                    _log.error("Not removing " + dbEntry + " because we have so few routers left ("
+                              + remaining + ") - perhaps a reseed is necessary?");
                 return;
             }
             if (System.currentTimeMillis() < _started + DONT_FAIL_PERIOD) {
-                _log.warn("Not failing the key " + dbEntry.toBase64()
-                + " since we've just started up and don't want to drop /everyone/");
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Not failing the key " + dbEntry.toBase64()
+                              + " since we've just started up and don't want to drop /everyone/");
                 return;
             }