diff --git a/archimedean.cpp b/archimedean.cpp
index 2de839f4..76433436 100644
--- a/archimedean.cpp
+++ b/archimedean.cpp
@@ -380,6 +380,7 @@ struct hrmap_archimedean : hrmap {
     origin->rval0 = origin->rval1 = 0;
     origin->cdata = NULL;
     origin->alt = NULL;
+    origin->c7 = NULL;
     origin->distance = 0;
 
     parent_index_of(origin) = DUAL ? 1 : 0;
diff --git a/cell.cpp b/cell.cpp
index cf75457d..fa957c35 100644
--- a/cell.cpp
+++ b/cell.cpp
@@ -314,7 +314,7 @@ void clearfrom(heptagon *at) {
         }
       }
     int edges = at->degree();
-    if(binarytiling) edges = at->c7->type;
+    if(binarytiling && DIM == 2) edges = at->c7->type;
     for(int i=0; i<edges; i++) if(at->move(i)) {
       if(at->move(i)->alt != &deletion_marker)
         q.push(at->move(i));    
diff --git a/euclid.cpp b/euclid.cpp
index 0dc03942..23225301 100644
--- a/euclid.cpp
+++ b/euclid.cpp
@@ -572,6 +572,7 @@ namespace euclid3 {
         h->c7 = newCell(S7, h);
         h->distance = 0;
         h->cdata = NULL;
+        h->alt = NULL;
         auto co = getcoord(at);
         if(S7 != 14)
           h->zebraval = gmod(co[0] + co[1] * 2 + co[2] * 4, 5);
diff --git a/reg3.cpp b/reg3.cpp
index dc2451a1..bf822a7a 100644
--- a/reg3.cpp
+++ b/reg3.cpp
@@ -320,7 +320,7 @@ namespace reg3 {
     ~hrmap_reg3() {
       if(binary_map) {        
         dynamicval<eGeometry> g(geometry, gBinary3);
-        // delete binary_map;
+        delete binary_map;
         }
       clearfrom(origin);
       }