diff --git a/geometry.cpp b/geometry.cpp
index 0692ffbd..5b5dafdf 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -909,7 +909,7 @@ EX void check_cgi() {
   if(GOLDBERG) V("GP", its(gp::param.first) + "," + its(gp::param.second));
   if(IRREGULAR) V("IRR", its(irr::irrid));
 
-  if(geometry == gArchimedean) V("ARCM", arcm::current.symbol);
+  if(archimedean) V("ARCM", arcm::current.symbol);
   
   if(cryst) V("CRYSTAL", its(ginf[gCrystal].sides) + its(ginf[gCrystal].vertex));
   
diff --git a/nonisotropic.cpp b/nonisotropic.cpp
index a05875fe..635c8ddb 100644
--- a/nonisotropic.cpp
+++ b/nonisotropic.cpp
@@ -1130,10 +1130,10 @@ EX namespace rots {
     return cspin(3, 2, -z) * cspin(0, 1, -z);
     }
   
-  std::unordered_map<int, transmatrix> saved_matrices;
-
   struct hrmap_rotation_space : hybrid::hrmap_hybrid {
 
+    std::unordered_map<int, transmatrix> saved_matrices;
+
     transmatrix relative_matrix(cell *c1, int i) {
       if(i == c1->type-2) return uzpush(-cgi.plevel) * spin(-2*cgi.plevel);
       if(i == c1->type-1) return uzpush(+cgi.plevel) * spin(+2*cgi.plevel);