diff --git a/pom.xml b/pom.xml
index 4960acf7d..71414243b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -448,6 +448,33 @@
                 </executions>
             </plugin>
 
+            <!-- Enable again once TC works-->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.7.0.1746</version>
+            </plugin>
+
         </plugins>
     </build>
     <profiles>
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java b/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
index a78ec3d1e..aa55b94cc 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
@@ -449,7 +449,7 @@ public abstract class VanillaChronicleHash<K,
     private void initOffsetsAndBulks() {
         segmentHeadersOffset = segmentHeadersOffset();
 
-        long segmentHeadersSize = actualSegments * segmentHeaderSize;
+        final long segmentHeadersSize = (long) actualSegments * (long) segmentHeaderSize;
         segmentsOffset = segmentHeadersOffset + segmentHeadersSize;
 
         if (createdOrInMemory) {
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/SegmentStages.java b/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/SegmentStages.java
index 6523c7663..dd507540e 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/SegmentStages.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/SegmentStages.java
@@ -570,7 +570,7 @@ public abstract class SegmentStages implements SegmentLock, LocksInterface {
     public abstract boolean segmentTierInit();
 
     public void initSegmentTier() {
-        tierIndex = segmentIndex + 1; // tiers are 1-counted
+        tierIndex = segmentIndex + 1L; // tiers are 1-counted
         tierBaseAddr = hh.h().segmentBaseAddr(segmentIndex);
         // assign the field of stage on which init() checks last, because flushed in segmentIndex()
         // initialization
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/util/math/PoissonDistribution.java b/src/main/java/net/openhft/chronicle/hash/impl/util/math/PoissonDistribution.java
index db8d8df51..86efbd990 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/util/math/PoissonDistribution.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/util/math/PoissonDistribution.java
@@ -66,12 +66,12 @@ public class PoissonDistribution {
             double k = Math.sqrt((1.0 - p) / p);
             double tmp = mu - k * sigma;
             if (tmp > lower) {
-                lower = ((int) Math.ceil(tmp)) - 1;
+                lower = ((int) Math.ceil(tmp)) - 1L;
             }
             k = 1.0 / k;
             tmp = mu + k * sigma;
             if (tmp < upper) {
-                upper = ((int) Math.ceil(tmp)) - 1;
+                upper = ((int) Math.ceil(tmp)) - 1L;
             }
         }
 
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index 08084f473..3f503ae26 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -910,7 +910,7 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
                                 TierCountersArea.segmentIndex(tierCountersAreaAddr));
                         final int tier = TierCountersArea.tier(tierCountersAreaAddr);
                         final long tierIndex = actualSegments +
-                                (bulkIndex << log2TiersInBulk) + tierIndexOffsetWithinBulk + 1;
+                                ((long) bulkIndex << log2TiersInBulk) + tierIndexOffsetWithinBulk + 1;
                         context.initSegmentTier(tier, tierIndex, tierBaseAddr);
                     }