diff --git a/C/flags.c b/C/flags.c
index 3d9da2373..4ccb29ce5 100644
--- a/C/flags.c
+++ b/C/flags.c
@@ -988,6 +988,7 @@ bool setYapFlag(Term tflag, Term t2) {
     return FALSE;
   }
   if (fv->global) {
+    CACHE_REGS
     switch (fv->FlagOfVE) {
     case UNKNOWN_FLAG:
     case CHARACTER_ESCAPES_FLAG:
diff --git a/C/init.c b/C/init.c
index f879572ed..6a138a444 100755
--- a/C/init.c
+++ b/C/init.c
@@ -1025,7 +1025,7 @@ static void InitLogDBErasedMarker(void) {
  LogDBErasedMarker->ClSize =
       (UInt)NEXTOP(((LogUpdClause *)NULL)->ClCode, e);
  LogDBErasedMarker->ClCode->opc = Yap_opcode(_op_fail);
-  INIT_CLREF_COUNT(Yap_heap_regs->logdb_erased_marker);
+  INIT_CLREF_COUNT(LogDBErasedMarker);
 }
 
 static void InitSWIAtoms(void) {
@@ -1087,7 +1087,7 @@ static void InitWideAtoms(void) {
 static void InitInvisibleAtoms(void) {
   /* initialize invisible chain */
   INVISIBLECHAIN.Entry = NIL;
-  INIT_RWLOCK(Yap_heap_regs->INVISIBLECHAIN.AERWLock);
+  INIT_RWLOCK(INVISIBLECHAIN.AERWLock);
 }
 
 #ifdef YAPOR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64ae907a9..99c505b55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -409,7 +409,9 @@ add_subDIRECTORY (packages/cplint)
 
 add_subDIRECTORY (packages/raptor)
 
-# add_subDIRECTORY (docs)
+add_subDIRECTORY (packages/xml)
+
+add_subDIRECTORY (docs)
 
 # add_subDIRECTORY (packages/cuda)