diff --git a/xo-indentlog/utest/log_streambuf.test.cpp b/xo-indentlog/utest/log_streambuf.test.cpp
index 1e38a01e..94d20195 100644
--- a/xo-indentlog/utest/log_streambuf.test.cpp
+++ b/xo-indentlog/utest/log_streambuf.test.cpp
@@ -77,7 +77,11 @@ namespace ut {
 
         //REQUIRE(sbuf.lo() == sbuf.pbase());
 
+#ifdef __linux__
+        auto expected = string_view("empty log_streambuf :sbuf.lo 0 :sbuf.hi 0 :sbuf.color_escape_chars 0");
+#else        
         auto expected = string_view("empty log_streambuf :sbuf.lo 0x0 :sbuf.hi 0x0 :sbuf.color_escape_chars 0");
+#endif
 
         REQUIRE(string_view(sbuf) == expected);
 
diff --git a/xo-interpreter2/utest/VirtualSchematikaMachine.test.cpp b/xo-interpreter2/utest/VirtualSchematikaMachine.test.cpp
index 9fb85ffc..3f5d145c 100644
--- a/xo-interpreter2/utest/VirtualSchematikaMachine.test.cpp
+++ b/xo-interpreter2/utest/VirtualSchematikaMachine.test.cpp
@@ -729,7 +729,7 @@ namespace xo {
 
             vsm.begin_interactive_session();
 
-            span_type input = span_type::from_cstr("report_memory_use();");
+            span_type input = span_type::from_cstr("report-memory-use();");
 
             log && log(xtag("input", input));
 
diff --git a/xo-procedure2/src/procedure2/ObjectPrimitives.cpp b/xo-procedure2/src/procedure2/ObjectPrimitives.cpp
index 4edd3873..d9d86f4a 100644
--- a/xo-procedure2/src/procedure2/ObjectPrimitives.cpp
+++ b/xo-procedure2/src/procedure2/ObjectPrimitives.cpp
@@ -33,9 +33,9 @@ namespace xo {
         xfer_cwd(obj<ARuntimeContext> rcx)
         {
             char buf[PATH_MAX];
-            ::getcwd(buf, sizeof(buf));
+            char * cwd = ::getcwd(buf, sizeof(buf));
 
-            return obj<AGCObject,DString>(DString::from_cstr(rcx.allocator(), buf));
+            return obj<AGCObject,DString>(DString::from_cstr(rcx.allocator(), cwd));
         }
 
         DPrimitive_gco_0 *
diff --git a/xo-reader2/idl/IGCObject_DGlobalEnv.json5 b/xo-reader2/idl/IGCObject_DGlobalEnv.json5
index 1a590527..c3d666dd 100644
--- a/xo-reader2/idl/IGCObject_DGlobalEnv.json5
+++ b/xo-reader2/idl/IGCObject_DGlobalEnv.json5
@@ -1,7 +1,7 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/reader2/facet",
-    output_hpp_dir: "include/xo/interpreter2",
+    output_hpp_dir: "include/xo/reader2",
     output_impl_subdir: "env",
     includes: [
         "<xo/alloc2/GCObject.hpp>",
diff --git a/xo-reader2/idl/IPrintable_DGlobalEnv.json5 b/xo-reader2/idl/IPrintable_DGlobalEnv.json5
index 0a05eb62..9e48847e 100644
--- a/xo-reader2/idl/IPrintable_DGlobalEnv.json5
+++ b/xo-reader2/idl/IPrintable_DGlobalEnv.json5
@@ -1,7 +1,7 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/interpreter2/facet",
-    output_hpp_dir: "include/xo/interpreter2",
+    output_cpp_dir: "src/reader2/facet",
+    output_hpp_dir: "include/xo/reader2",
     output_impl_subdir: "env",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
diff --git a/xo-reader2/idl/IPrintable_DParenSsm.json5 b/xo-reader2/idl/IPrintable_DParenSsm.json5
index 9750cb31..6735436c 100644
--- a/xo-reader2/idl/IPrintable_DParenSsm.json5
+++ b/xo-reader2/idl/IPrintable_DParenSsm.json5
@@ -2,7 +2,7 @@
     mode: "implementation",
     output_cpp_dir: "src/reader2",
     output_hpp_dir: "include/xo/reader2",
-    output_impl_subdir: "ssm",
+    output_impl_subdir: "paren",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [],
diff --git a/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5
index 7ea19fc0..dcdb298c 100644
--- a/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5
+++ b/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5
@@ -2,7 +2,7 @@
     mode: "implementation",
     output_cpp_dir: "src/reader2",
     output_hpp_dir: "include/xo/reader2",
-    output_impl_subdir: "ssm",
+    output_impl_subdir: "paren",
     includes: [ "\"SyntaxStateMachine.hpp\"",
                 "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ],
     local_types: [ ],
diff --git a/xo-reader2/include/xo/reader2/ParenSsm.hpp b/xo-reader2/include/xo/reader2/ParenSsm.hpp
index a9a786fd..ff03da9b 100644
--- a/xo-reader2/include/xo/reader2/ParenSsm.hpp
+++ b/xo-reader2/include/xo/reader2/ParenSsm.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "DParenSsm.hpp"
-#include "ssm/ISyntaxStateMachine_DParenSsm.hpp"
-#include "ssm/IPrintable_DParenSsm.hpp"
+#include "paren/DParenSsm.hpp"
+#include "paren/ISyntaxStateMachine_DParenSsm.hpp"
+#include "paren/IPrintable_DParenSsm.hpp"
 
 /* end ParenSsm.hpp */
diff --git a/xo-reader2/include/xo/reader2/DParenSsm.hpp b/xo-reader2/include/xo/reader2/paren/DParenSsm.hpp
similarity index 100%
rename from xo-reader2/include/xo/reader2/DParenSsm.hpp
rename to xo-reader2/include/xo/reader2/paren/DParenSsm.hpp
diff --git a/xo-reader2/include/xo/reader2/ssm/IPrintable_DParenSsm.hpp b/xo-reader2/include/xo/reader2/paren/IPrintable_DParenSsm.hpp
similarity index 100%
rename from xo-reader2/include/xo/reader2/ssm/IPrintable_DParenSsm.hpp
rename to xo-reader2/include/xo/reader2/paren/IPrintable_DParenSsm.hpp
diff --git a/xo-reader2/include/xo/reader2/ssm/ISyntaxStateMachine_DParenSsm.hpp b/xo-reader2/include/xo/reader2/paren/ISyntaxStateMachine_DParenSsm.hpp
similarity index 100%
rename from xo-reader2/include/xo/reader2/ssm/ISyntaxStateMachine_DParenSsm.hpp
rename to xo-reader2/include/xo/reader2/paren/ISyntaxStateMachine_DParenSsm.hpp
diff --git a/xo-reader2/src/reader2/IPrintable_DParenSsm.cpp b/xo-reader2/src/reader2/IPrintable_DParenSsm.cpp
index b2228f7f..7cda341b 100644
--- a/xo-reader2/src/reader2/IPrintable_DParenSsm.cpp
+++ b/xo-reader2/src/reader2/IPrintable_DParenSsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/IPrintable_DParenSsm.json5]
 **/
 
-#include "ssm/IPrintable_DParenSsm.hpp"
+#include "paren/IPrintable_DParenSsm.hpp"
 
 namespace xo {
     namespace scm {
diff --git a/xo-reader2/src/reader2/ISyntaxStateMachine_DParenSsm.cpp b/xo-reader2/src/reader2/ISyntaxStateMachine_DParenSsm.cpp
index 05f5d4cc..555ae683 100644
--- a/xo-reader2/src/reader2/ISyntaxStateMachine_DParenSsm.cpp
+++ b/xo-reader2/src/reader2/ISyntaxStateMachine_DParenSsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/ISyntaxStateMachine_DParenSsm.json5]
 **/
 
-#include "ssm/ISyntaxStateMachine_DParenSsm.hpp"
+#include "paren/ISyntaxStateMachine_DParenSsm.hpp"
 
 namespace xo {
     namespace scm {
diff --git a/xo-type/src/type/Metatype.cpp b/xo-type/src/type/Metatype.cpp
index 1ac26f62..1eb0138e 100644
--- a/xo-type/src/type/Metatype.cpp
+++ b/xo-type/src/type/Metatype.cpp
@@ -4,6 +4,7 @@
  **/
 
 #include "Metatype.hpp"
+#include <cassert>
 
 namespace xo {
     namespace scm {
@@ -36,6 +37,9 @@ namespace xo {
             case code::t_callable: return "callable";
             case code::t_any:      return "any";
             }
+
+            assert(false);
+            return "?metatype";
         }
 
         bool
@@ -86,6 +90,9 @@ namespace xo {
             case code::t_any:
                 return true;
             }
+
+            assert(false);
+            return false;
         }
 
     } /*namespace scm*/