diff --git a/debuggers/t32/src/main.cc b/debuggers/t32/src/main.cc
index af3c68a8..27271b87 100644
--- a/debuggers/t32/src/main.cc
+++ b/debuggers/t32/src/main.cc
@@ -18,8 +18,8 @@
 #include <vector>
 #include "config/VariantConfig.hpp"
 #include "sal/SALInst.hpp"
-#include "optionparser/optionparser.h"
-#include "optionparser/optionparser_ext.hpp"
+#include "util/optionparser/optionparser.h"
+#include "util/optionparser/optionparser_ext.hpp"
 
 #include "T32Connector.hpp"
 #include "t32config.hpp"
diff --git a/src/core/sal/SimulatorController.cc b/src/core/sal/SimulatorController.cc
index 9a71f3e2..93ef281f 100644
--- a/src/core/sal/SimulatorController.cc
+++ b/src/core/sal/SimulatorController.cc
@@ -43,7 +43,8 @@ void SimulatorController::startup(int argc, char **argv)
 	// TODO: Log-Level?
 	
 	if (argv) {
-		CommandLine::Inst().collect_args(bx_startup_flags.argc, bx_startup_flags.argv);
+    // FIXME: bx_startup_flags only exits in Bochs build!!
+		//CommandLine::Inst().collect_args(bx_startup_flags.argc, bx_startup_flags.argv);
 	}
 
 	// Activate previously added experiments to allow initialization: