diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index bc56353bd..2c47b93cc 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -1952,7 +1952,6 @@ class StatelessServerConnector<K, V> {
     }
 
     private void writeSizeAndFlags(long locationOfSize, boolean isException, Bytes out) {
-        long currentPosition = out.position();
         final long size = out.position() - locationOfSize;
         out.writeInt(locationOfSize, (int) size); // size
         out.writeBoolean(locationOfSize + SIZE_OF_SIZE, isException); // isException
@@ -1964,7 +1963,7 @@ class StatelessServerConnector<K, V> {
 
     private Map<K, V> readEntries(Bytes reader) {
         final long numberOfEntries = reader.readStopBit();
-        final HashMap<K, V> result = new HashMap<K, V>();
+        final Map<K, V> result = new HashMap<K, V>();
 
         ThreadLocalCopies copies = keyReaderWithSize.getCopies(null);
         BytesReader<K> keyReader = keyReaderWithSize.readerForLoop(copies);
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamplesTest.java b/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamplesTest.java
index 86376bd1f..fb2dd851d 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamplesTest.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamplesTest.java
@@ -89,11 +89,13 @@ public class StringEncodingExamplesTest {
 
         @Override
         public CharSequence read(Bytes bytes) {
-            int csLen = (int) bytes.readStopBit();
+            long csLen = bytes.readStopBit();
+            if (csLen < 0 || csLen > Integer.MAX_VALUE)
+                throw new IllegalStateException("length invalid: " + csLen);
             if (returnedCharBuffer == null || returnedCharBuffer.capacity() < csLen) {
-                returnedCharBuffer = CharBuffer.allocate(csLen);
+                returnedCharBuffer = CharBuffer.allocate((int) csLen);
             } else {
-                returnedCharBuffer.clear().limit(csLen);
+                returnedCharBuffer.clear().limit((int) csLen);
             }
             bytesAsBuffer = bytes.sliceAsByteBuffer(bytesAsBuffer);
             decoder.decode(bytesAsBuffer, returnedCharBuffer, true);