diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index e56819fe3..83b0bc120 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -560,10 +560,10 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
     }
     
     private ChainingInterface q() {
-        ChainingInterface queryContext;
-        queryContext = cxt.get();
+        //noinspection unchecked
+        ChainingInterface queryContext = cxt.get();
         if (queryContext == null) {
-            queryContext = new CompiledReplicatedMapQueryContext<>(ReplicatedChronicleMap.this);
+            queryContext = new CompiledReplicatedMapQueryContext<>(this);
             addContext(queryContext);
             cxt.set(queryContext);
         }
@@ -595,10 +595,10 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
     }
 
     private ChainingInterface i() {
-        ChainingInterface iterContext;
-        iterContext = cxt.get();
+        //noinspection unchecked
+        ChainingInterface iterContext = cxt.get();
         if (iterContext == null) {
-            iterContext = new CompiledReplicatedMapIterationContext<>(ReplicatedChronicleMap.this);
+            iterContext = new CompiledReplicatedMapIterationContext<>(this);
             addContext(iterContext);
             cxt.set(iterContext);
         }
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index 4718503ab..409faebf4 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -263,10 +263,10 @@ public class VanillaChronicleMap<K, V, R>
     }
 
     private ChainingInterface q() {
-        ChainingInterface queryContext;
-        queryContext = cxt.get();
+        //noinspection unchecked
+        ChainingInterface queryContext = cxt.get();
         if (queryContext == null) {
-            queryContext = new CompiledMapQueryContext<>(VanillaChronicleMap.this);
+            queryContext = new CompiledMapQueryContext<>(this);
             addContext(queryContext);
             cxt.set(queryContext);
         }
@@ -274,15 +274,16 @@ public class VanillaChronicleMap<K, V, R>
     }
 
     public QueryContextInterface<K, V, R> mapContext() {
+        //noinspection unchecked
         return q().getContext(CompiledMapQueryContext.class,
                 ci -> new CompiledMapQueryContext<>(ci, this));
     }
 
     private ChainingInterface i() {
-        ChainingInterface iterContext;
-        iterContext = cxt.get();
+        //noinspection unchecked
+        ChainingInterface iterContext = cxt.get();
         if (iterContext == null) {
-            iterContext = new CompiledMapIterationContext<>(VanillaChronicleMap.this);
+            iterContext = new CompiledMapIterationContext<>(this);
             addContext(iterContext);
             cxt.set(iterContext);
         }