diff --git a/.cproject b/.cproject
index 0b2242c..23a37ba 100644
--- a/.cproject
+++ b/.cproject
@@ -48,15 +48,14 @@
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/>
 				</defs>
 			</storageModule>
-			<storageModule buildDir="build/${ConfigName}" dirtyTs="1715591188169" moduleId="de.marw.cmake4eclipse.mbs.settings">
+			<storageModule buildDir="build/${ConfigName}" dirtyTs="1698593487517" moduleId="de.marw.cmake4eclipse.mbs.settings">
 				<options/>
 				<defs>
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
 					<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
 					<def name="WITH_TCC" type="BOOL" val="ON"/>
-					<def name="FW_BUILD" type="BOOL" val="ON"/>
+					<def name="BUILD_COMMON_FW" type="BOOL" val="ON"/>
 					<def name="ENABLE_CLANG_TIDY" type="BOOL" val="ON"/>
-					<def name="WITH_ASMJIT" type="BOOL" val="ON"/>
 				</defs>
 			</storageModule>
 		</cconfiguration>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d522890..fcf0afd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,12 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
     # stand alone build settings
     ###########################################################################
     set(CORE_NAME TGC5C CACHE STRING "The core to build the ISS for" )
-    option(FW_BUILD "Enable the automatic download and build of some firmware to run on the ISS" OFF)
+    option(BUILD_COMMON_FW "Enable the automatic download and build of some firmware to run on the ISS" OFF)
     option(ENABLE_SANITIZER "Enable address sanitizer" OFF)
     option(ENABLE_CLANG_TIDY "Add clang-tidy and clang-format automatically to builds" OFF)
     option(WITH_TCC "Build TCC backend" OFF)
     option(WITH_LLVM "Build LLVM backend" OFF)
-    option(WITH_ASMJIT "Build ASMJIT backend" ON)
+    option(WITH_ASMJIT "Build ASMJIT backend" OFF)
     
     set(CMAKE_CXX_STANDARD 14)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/dbt-rise-core b/dbt-rise-core
index f78cc53..6a5bb0f 160000
--- a/dbt-rise-core
+++ b/dbt-rise-core
@@ -1 +1 @@
-Subproject commit f78cc53a33c57bbe970aea69519cdadb73ede9ab
+Subproject commit 6a5bb0fe5e067c23678876716777f8e65c60636a