diff --git a/src/Handlers/MainContainer.cpp b/src/Handlers/MainContainer.cpp
index daeefd143..28173133a 100644
--- a/src/Handlers/MainContainer.cpp
+++ b/src/Handlers/MainContainer.cpp
@@ -4,7 +4,7 @@ int MainContainer::Init () {
 		GenericAction::Init();
 		char filename[STRING_LEN];
 		solver->outIterFile("config", ".xml", filename);
-		pugi::xml_node n = solver->configfile.append_child("Run");
+		pugi::xml_node n = solver->configfile.child("CLBConfig").append_child("Run");
 		n.append_attribute("model").set_value(MODEL);
 		pugi::xml_node c = n.append_child("Code");
 		c.append_attribute("version").set_value(VERSION);
diff --git a/src/Handlers/vHandler.cpp b/src/Handlers/vHandler.cpp
index 8450fcba8..cd397a5a6 100644
--- a/src/Handlers/vHandler.cpp
+++ b/src/Handlers/vHandler.cpp
@@ -202,7 +202,9 @@ vHandler * getHandler(pugi::xml_node node) {
 		ret = new conControlParameter;
 	} else if (name=="SyntheticTurbulence") {
 		ret = new acSyntheticTurbulence;
-    } else {
+    } else if (name=="Run") {
+		output("Skipping 'Run' element");
+    }else {
 		ERROR("Unknown element '%s'\n", node.name());
 		return NULL;
 	}
diff --git a/src/config.mk.in b/src/config.mk.in
index 8017d67c5..a9fd9ae3c 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -2,7 +2,7 @@
 OPT = @CPPFLAGS@
 CPP_OPT = -Wno-write-strings @CPP_OPT@
 LD_OPT = @LDFLAGS@ @LIBS@
-NV_OPT = @NVFLAGS@
+NV_OPT = -D_FORCE_INLINES  @NVFLAGS@
 CPU = @CROSS_CPU@
 
 PV_SOURCE = @PV_SOURCE@