diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index cfa79e85c..f6de2f219 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -52,9 +52,7 @@ import java.util.concurrent.TimeUnit;
 import static java.lang.Double.isNaN;
 import static java.lang.Math.round;
 import static net.openhft.chronicle.bytes.NativeBytesStore.lazyNativeBytesStoreWithFixedCapacity;
-import static net.openhft.chronicle.core.Maths.divideRoundUp;
-import static net.openhft.chronicle.core.Maths.isPowerOf2;
-import static net.openhft.chronicle.core.Maths.nextPower2;
+import static net.openhft.chronicle.core.Maths.*;
 import static net.openhft.chronicle.hash.impl.CompactOffHeapLinearHashTable.*;
 import static net.openhft.chronicle.hash.impl.util.Objects.builderEquals;
 import static net.openhft.chronicle.map.DefaultSpi.mapEntryOperations;
diff --git a/src/test/java/net/openhft/chronicle/map/Issue58.java b/src/test/java/net/openhft/chronicle/map/Issue58.java
index d9d1883e3..f7e18640f 100644
--- a/src/test/java/net/openhft/chronicle/map/Issue58.java
+++ b/src/test/java/net/openhft/chronicle/map/Issue58.java
@@ -60,16 +60,16 @@ public class Issue58 {
         try (
                 ChronicleMap<String, UUID> map = ChronicleMap.of(String.class, UUID.class)
                         .averageKeySize(2)
-                        .valueMarshallers(UuidMarshaller.INSTANCE, UuidMarshaller.INSTANCE)
+                        .valueMarshaller(UuidMarshaller.INSTANCE)
                         .constantValueSizeBySample(UUID.randomUUID())
                         .entries(data.size())
                         .createPersistedTo(mapFile);
                 ChronicleMap<UUID, String> reverseMap = ChronicleMap.of(UUID.class, String.class)
-                        .keyMarshallers(UuidMarshaller.INSTANCE, UuidMarshaller.INSTANCE)
+                        .keyMarshaller(UuidMarshaller.INSTANCE)
                         .averageValueSize(2)
                         .constantKeySizeBySample(UUID.randomUUID())
                         .entries(data.size())
-                        .createPersistedTo(reverseMapFile);
+                        .createPersistedTo(reverseMapFile)
         ) {
 
             map.putAll(data);
@@ -84,12 +84,12 @@ public class Issue58 {
         try (
                 ChronicleMap<String, UUID> map = ChronicleMap.of(String.class, UUID.class)
                         .averageKeySize(2)
-                        .valueMarshallers(UuidMarshaller.INSTANCE, UuidMarshaller.INSTANCE)
+                        .valueMarshaller(UuidMarshaller.INSTANCE)
                         .constantValueSizeBySample(UUID.randomUUID())
                         .entries(data.size())
                         .createPersistedTo(mapFile);
                 ChronicleMap<UUID, String> reverseMap = ChronicleMap.of(UUID.class, String.class)
-                        .keyMarshallers(UuidMarshaller.INSTANCE, UuidMarshaller.INSTANCE)
+                        .keyMarshaller(UuidMarshaller.INSTANCE)
                         .constantKeySizeBySample(UUID.randomUUID())
                         .averageValueSize(2)
                         .entries(data.size())
@@ -106,12 +106,12 @@ public class Issue58 {
         try (
                 ChronicleMap<String, UUID> map = ChronicleMap.of(String.class, UUID.class)
                         .averageKeySize(2)
-                        .valueMarshallers(UuidMarshaller.INSTANCE, UuidMarshaller.INSTANCE)
+                        .valueMarshaller(UuidMarshaller.INSTANCE)
                         .constantValueSizeBySample(UUID.randomUUID())
                         .entries(data.size())
                         .createPersistedTo(mapFile);
                 ChronicleMap<UUID, String> reverseMap = ChronicleMap.of(UUID.class, String.class)
-                        .keyMarshallers(UuidMarshaller.INSTANCE, UuidMarshaller.INSTANCE)
+                        .keyMarshaller(UuidMarshaller.INSTANCE)
                         .constantKeySizeBySample(UUID.randomUUID())
                         .averageValueSize(2)
                         .entries(data.size())
diff --git a/src/test/java/net/openhft/chronicle/map/Issue63Test.java b/src/test/java/net/openhft/chronicle/map/Issue63Test.java
index ed95e06b0..96be9d4a2 100644
--- a/src/test/java/net/openhft/chronicle/map/Issue63Test.java
+++ b/src/test/java/net/openhft/chronicle/map/Issue63Test.java
@@ -26,7 +26,7 @@ import java.nio.file.Paths;
 import static org.junit.Assert.assertArrayEquals;
 
 public class Issue63Test {
-    
+
     @Test
     public void issue63Test() throws Exception {
         Path path = Paths.get(System.getProperty("java.io.tmpdir") + "/test-vectors.dat");