diff --git a/xo-reader2/src/reader2/reader2_register_facets.cpp b/xo-reader2/src/reader2/reader2_register_facets.cpp
index 39e51a07..ab279f56 100644
--- a/xo-reader2/src/reader2/reader2_register_facets.cpp
+++ b/xo-reader2/src/reader2/reader2_register_facets.cpp
@@ -5,15 +5,21 @@
 
 #include "reader2_register_facets.hpp"
 
+#include <xo/reader2/SchematikaParser.hpp>
+
+//#include <xo/reader2/ExprSeqState.hpp>
 #include <xo/reader2/ssm/ISyntaxStateMachine_DExprSeqState.hpp>
 #include <xo/reader2/ssm/IPrintable_DExprSeqState.hpp>
 
+//#include <xo/reader2/DefineSsm.hpp>
 #include <xo/reader2/ssm/ISyntaxStateMachine_DDefineSsm.hpp>
 #include <xo/reader2/ssm/IPrintable_DDefineSsm.hpp>
 
-#include <xo/reader2/ssm/ISyntaxStateMachine_DLambdaSsm.hpp>
-#include <xo/reader2/ssm/IPrintable_DLambdaSsm.hpp>
+#include <xo/reader2/LambdaSsm.hpp>
+//#include <xo/reader2/ssm/ISyntaxStateMachine_DLambdaSsm.hpp>
+//#include <xo/reader2/ssm/IPrintable_DLambdaSsm.hpp>
 
+//#include <xo/reader2/IfElseSsm.hpp>
 #include <xo/reader2/ssm/ISyntaxStateMachine_DIfElseSsm.hpp>
 #include <xo/reader2/ssm/IPrintable_DIfElseSsm.hpp>
 
diff --git a/xo-reader2/utest/SchematikaParser.test.cpp b/xo-reader2/utest/SchematikaParser.test.cpp
index 46385c56..5d831b13 100644
--- a/xo-reader2/utest/SchematikaParser.test.cpp
+++ b/xo-reader2/utest/SchematikaParser.test.cpp
@@ -58,7 +58,8 @@ namespace xo {
                 this->aux_arena_
                     = std::move(DArena(ArenaConfig()
                                        .with_name(testname)
-                                       .with_size(4 * 1024)));
+                                       .with_size(4 * 1024)
+                                       .with_store_header_flag(true)));
                 obj<AAllocator,DArena> aux_mm(&aux_arena_);
 
                 this->expr_arena_