diff --git a/router/java/src/net/i2p/router/transport/ntcp/EstablishBase.java b/router/java/src/net/i2p/router/transport/ntcp/EstablishBase.java
index 815682dda..452ebfabd 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/EstablishBase.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/EstablishBase.java
@@ -47,6 +47,7 @@ import net.i2p.util.SimpleByteCache;
  * isCheckInfo()
  * NOTE: Check info is unused.
  *
+ * @since 0.9.35 pulled out of EstablishState
  */
 abstract class EstablishBase implements EstablishState {
     
@@ -104,7 +105,7 @@ abstract class EstablishBase implements EstablishState {
     protected static final int HXY_SIZE = 32;  //Hash.HASH_LENGTH;
     protected static final int HXY_TSB_PAD_SIZE = HXY_SIZE + 4 + 12;  // 48
 
-    protected static final Object _stateLock = new Object();
+    protected final Object _stateLock = new Object();
     protected State _state;
 
     protected enum State {
diff --git a/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
index 122823474..c303a4cd1 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
@@ -23,6 +23,7 @@ import net.i2p.util.SimpleByteCache;
  *
  *  NTCP 1 or 2. We are Bob.
  *
+ *  @since 0.9.35 pulled out of EstablishState
  */
 class InboundEstablishState extends EstablishBase {
 
diff --git a/router/java/src/net/i2p/router/transport/ntcp/OutboundEstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/OutboundEstablishState.java
index d689a65b4..e7af82c42 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/OutboundEstablishState.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/OutboundEstablishState.java
@@ -20,6 +20,7 @@ import net.i2p.util.SimpleByteCache;
  *
  *  NTCP 1 only. We are Alice.
  *
+ *  @since 0.9.35 pulled out of EstablishState
  */
 class OutboundEstablishState extends EstablishBase {