diff --git a/include/circuit_builder.cpp b/include/circuit_builder.cpp
index b53e41c..a95c647 100644
--- a/include/circuit_builder.cpp
+++ b/include/circuit_builder.cpp
@@ -380,9 +380,10 @@ class CircuitBuilder : public CircuitBuilderBase {
     MultShare field_weight = delta_weight * comp;
 
 #ifdef DEBUG_SEL_CIRCUIT
-    print_share(delta_weight, format("weight ({}){}", ftype, i));
-    print_share(comp, format("comp ({}){}", ftype, i));
-    print_share(field_weight, format("^^^^ field weight ({}){} ^^^^", ftype, i));
+    //FIXME(SS): Compilation error, if -DDEBUG_SEL_CIRCUIT
+    //print_share(delta_weight, format("weight ({}){}", ftype, i));
+    //print_share(comp, format("comp ({}){}", ftype, i));
+    //print_share(field_weight, format("^^^^ field weight ({}){} ^^^^", ftype, i));
 #endif
 
     return field_weight_cache[i] = {field_weight, delta_weight};
diff --git a/include/epilink_input.h b/include/epilink_input.h
index af4d90d..fd020e5 100644
--- a/include/epilink_input.h
+++ b/include/epilink_input.h
@@ -26,6 +26,7 @@
 #include <vector>
 #include <map>
 #include <cstdint>
+#include <optional>
 
 namespace sel {
 
diff --git a/sepilinker.cpp b/sepilinker.cpp
index da1ae42..1ac1567 100644
--- a/sepilinker.cpp
+++ b/sepilinker.cpp
@@ -195,7 +195,7 @@ int main(int argc, char* argv[]) {
           sel::valid_matchrecord_json_handler, sel::invalid_json_handler);
   auto matchrecords_methodhandler =
       sel::MethodHandler::create_methodhandler<sel::JsonMethodHandler>(
-          "POST", linkrecord_validator,
+          "POST", null_validator,
           sel::valid_matchrecords_json_handler, sel::invalid_json_handler);
 #endif
   // Create GET-Handler for job status monitoring
@@ -273,6 +273,7 @@ int main(int argc, char* argv[]) {
   linkrecords_handler.publish(service);
 #ifdef SEL_MATCHING_MODE
   matchrecord_handler.publish(service);
+  matchrecords_handler.publish(service);
 #endif
   jobmonitor_handler.publish(service);
   test_config_handler.publish(service);