--- old/src/share/vm/gc/shenandoah/shenandoahHeap.cpp	2017-03-21 22:27:39.651700178 +0100
+++ new/src/share/vm/gc/shenandoah/shenandoahHeap.cpp	2017-03-21 22:27:39.499700540 +0100
@@ -144,6 +144,8 @@
 jint ShenandoahHeap::initialize() {
   CollectedHeap::pre_initialize();
 
+  BrooksPointer::initial_checks();
+
   size_t init_byte_size = collector_policy()->initial_heap_byte_size();
   size_t max_byte_size = collector_policy()->max_heap_byte_size();
 
@@ -769,7 +771,7 @@
   }
   _numAllocs++;
 #endif
-  HeapWord* filler = allocate_memory(BrooksPointer::word_size() + size, false);
+  HeapWord* filler = allocate_memory(size + BrooksPointer::word_size(), false);
   HeapWord* result = filler + BrooksPointer::word_size();
   if (filler != NULL) {
     BrooksPointer::initialize(oop(result));