diff --git a/pom.xml b/pom.xml
index 29f224587..ec76020dc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -133,8 +133,8 @@
                     <compilerArgument>-Xlint:deprecation</compilerArgument>
                     <source>1.6</source>
                     <target>1.6</target>
-                    <testSource>1.8</testSource>
-                    <testTarget>1.8</testTarget>
+                    <testSource>1.6</testSource>
+                    <testTarget>1.6</testTarget>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscoveryBroadcaster.java b/src/main/java/net/openhft/chronicle/map/NodeDiscoveryBroadcaster.java
index 44b75a892..39aca9c75 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscoveryBroadcaster.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscoveryBroadcaster.java
@@ -412,7 +412,8 @@ class BytesExternalizableImpl implements BytesExternalizable {
         Bytes bytes = allNodes.activeIdentifierBytes();
         //bytes.position(0);
 
-        toString(allNodes.activeIdentifierBitSet(), "writing");
+        if (LOG.isDebugEnabled())
+            toString(allNodes.activeIdentifierBitSet(), "writing");
 
         // we will store the size of the bitset
         destination.writeUnsignedShort((int) bytes.remaining());
@@ -647,7 +648,7 @@ class BytesExternalizableImpl implements BytesExternalizable {
 
             long size = BOOTSTRAP_BYTES.limit();
 
-            if (size < source.remaining())
+            if (size > source.remaining())
                 return null;
 
             for (int i = 0; i < size; i++) {
diff --git a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java
index bd382ddac..59a2ac237 100644
--- a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java
+++ b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java
@@ -27,7 +27,7 @@ public class NodeDiscoveryBroadcasterTest extends TestCase {
 
         DiscoveryCluster discoveryCluster = new DiscoveryCluster();
 
-        ChronicleMap<Integer, CharSequence> map = discoveryCluster.discoverMap(1025, 8086);
+        ChronicleMap<Integer, CharSequence> map = discoveryCluster.discoverMap(1025, 8087);
 
         Thread.sleep(10000);
     }