diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java
index 2c96fa4870645af110ee40367e52c1e779b9d2dd..7a7d448ea99d10bf1ec51ee2953142ca17c915f4 100644
--- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java
@@ -41,8 +41,6 @@ public class ClientListenerRunner implements Runnable {
         _log = _context.logManager().getLog(ClientListenerRunner.class);
         _manager = manager;
         _port = port;
-        _running = false;
-        _listening = false;
         
         String val = context.getProperty(BIND_ALL_INTERFACES);
         _bindAllInterfaces = Boolean.valueOf(val).booleanValue();
diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
index e90d12f53599c7facc7c17b967c3ddc7b0c5cc5d..066d6cc354223c3ee1e53b56e31c78fc4f82e4ab 100644
--- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
@@ -43,7 +43,6 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade {
     
     public ClientManagerFacadeImpl(RouterContext context) {
         _context = context;
-        _manager = null;
         _log.debug("Client manager facade created");
     }
     
diff --git a/router/java/src/net/i2p/router/client/LeaseRequestState.java b/router/java/src/net/i2p/router/client/LeaseRequestState.java
index b4cf4415a4d7012515acf1b7bfe1c8040864e9f4..7e2a248ac948481129ceedd6890755f6f22b33ec 100644
--- a/router/java/src/net/i2p/router/client/LeaseRequestState.java
+++ b/router/java/src/net/i2p/router/client/LeaseRequestState.java
@@ -33,7 +33,6 @@ class LeaseRequestState {
         _onFailed = onFailed;
         _expiration = expiration;
         _requestedLeaseSet = requested;
-        _successful = false;
     }
     
     /** created lease set from client */
diff --git a/router/java/src/net/i2p/router/client/MessageReceivedJob.java b/router/java/src/net/i2p/router/client/MessageReceivedJob.java
index d0c767828f296fd312d7668c66a16e762114390a..82744659abed01762717dd1e067e1a4fc87887c8 100644
--- a/router/java/src/net/i2p/router/client/MessageReceivedJob.java
+++ b/router/java/src/net/i2p/router/client/MessageReceivedJob.java
@@ -47,9 +47,6 @@ class MessageReceivedJob extends JobImpl {
     
     /**
      * Deliver notification to the client that the given message is available.
-     * This is synchronous and returns true if the notification was sent safely,
-     * otherwise it returns false
-     *
      */
     public void messageAvailable(MessageId id, long size) {
         if (_log.shouldLog(Log.DEBUG))
@@ -59,6 +56,7 @@ class MessageReceivedJob extends JobImpl {
         msg.setMessageId(id.getMessageId());
         msg.setSessionId(_runner.getSessionId().getSessionId());
         msg.setSize(size);
+        // has to be >= 0, it is initialized to -1
         msg.setNonce(1);
         msg.setStatus(MessageStatusMessage.STATUS_AVAILABLE);
         try {
diff --git a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
index 51d3a304c907f4c5f91e3ff21b604d650f72b495..516a652d22b8b6381b5d94ec42c28193556649c1 100644
--- a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
+++ b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
@@ -44,9 +44,9 @@ class RequestLeaseSetJob extends JobImpl {
         _onCreate = onCreate;
         _onFail = onFail;
         _requestState = state;
-        ctx.statManager().createRateStat("client.requestLeaseSetSuccess", "How frequently the router requests successfully a new leaseSet?", "ClientMessages", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 });
-        ctx.statManager().createRateStat("client.requestLeaseSetTimeout", "How frequently the router requests a new leaseSet but gets no reply?", "ClientMessages", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 });
-        ctx.statManager().createRateStat("client.requestLeaseSetDropped", "How frequently the router requests a new leaseSet but the client drops?", "ClientMessages", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 });
+        ctx.statManager().createRateStat("client.requestLeaseSetSuccess", "How frequently the router requests successfully a new leaseSet?", "ClientMessages", new long[] { 60*60*1000 });
+        ctx.statManager().createRateStat("client.requestLeaseSetTimeout", "How frequently the router requests a new leaseSet but gets no reply?", "ClientMessages", new long[] { 60*60*1000 });
+        ctx.statManager().createRateStat("client.requestLeaseSetDropped", "How frequently the router requests a new leaseSet but the client drops?", "ClientMessages", new long[] { 60*60*1000 });
     }
     
     public String getName() { return "Request Lease Set"; }