diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
index 8098520b1..3b71cf3f1 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
@@ -185,7 +185,6 @@ class Sorters {
 
         private static int getStatus(Snark snark) {
             long remaining = snark.getRemainingLength(); 
-            long needed = snark.getNeededLength(); 
             if (snark.isStopped()) {
                 if (remaining < 0)
                     return 0;
diff --git a/apps/susimail/src/src/org/mortbay/util/ByteArrayPool.java b/apps/susimail/src/src/org/mortbay/util/ByteArrayPool.java
index 4d8a877c0..9a3f088fb 100644
--- a/apps/susimail/src/src/org/mortbay/util/ByteArrayPool.java
+++ b/apps/susimail/src/src/org/mortbay/util/ByteArrayPool.java
@@ -15,6 +15,7 @@
 
 package org.mortbay.util;
 
+import java.util.concurrent.atomic.AtomicInteger;
 
 /* ------------------------------------------------------------ */
 /** Byte Array Pool
@@ -29,7 +30,7 @@ public class ByteArrayPool
         Integer.getInteger("org.mortbay.util.ByteArrayPool.pool_size",8).intValue();
     
     public static final ThreadLocal __pools=new BAThreadLocal();
-    public static int __slot;
+    public static final AtomicInteger __slot = new AtomicInteger();
     
     /* ------------------------------------------------------------ */
     /** Get a byte array from the pool of known size.
@@ -94,7 +95,7 @@ public class ByteArrayPool
         }
 
         // slot.
-        int s = __slot++;
+        int s = __slot.getAndIncrement();
         if (s<0)s=-s;
         pool[s%pool.length]=b;
     }
diff --git a/core/java/src/net/i2p/client/DomainSocketFactory.java b/core/java/src/net/i2p/client/DomainSocketFactory.java
index cf8908499..e32deebdd 100644
--- a/core/java/src/net/i2p/client/DomainSocketFactory.java
+++ b/core/java/src/net/i2p/client/DomainSocketFactory.java
@@ -16,7 +16,7 @@ import net.i2p.I2PAppContext;
  * @since 0.9.14
  */
 public class DomainSocketFactory {
-    public static String I2CP_SOCKET_ADDRESS = "net.i2p.client.i2cp";
+    public static final String I2CP_SOCKET_ADDRESS = "net.i2p.client.i2cp";
 
     /**
      * @throws UnsupportedOperationException always
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
index cdcfabdeb..283c0707f 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
@@ -846,7 +846,11 @@ public class Ed25519FieldElement extends FieldElement {
 
     @Override
     public int hashCode() {
-        return t.hashCode(); // TODO should this be something else?
+        int rv = 0;
+        for (int i = 0; i < 10; i++) {
+            rv ^= t[i];
+        }
+        return rv;
     }
 
     @Override
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
index 1f61cb197..adacea03f 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
@@ -569,7 +569,6 @@ class UDPPacketReader {
          *  @since 0.9.16
          */
         public int highestReceived() {
-            int count = fragmentCount();
             for (int i = _bitfieldSize - 1; i >= 0; i--) {
                 byte b = _message[_bitfieldStart + i];
                 if ((b & 0x7f) == 0)