diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
index 3538700c..8129790c 100644
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -4,7 +4,7 @@
 #include <fsfw/tmtcservices/PusServiceBase.h>
 #include <mission/controller/ThermalController.h>
 #include <mission/core/GenericFactory.h>
-#include <mission/utility/TmFunnel.h>
+#include <mission/tmtc/TmFunnel.h>
 #include <objects/systemObjectList.h>
 #include <tmtc/apid.h>
 #include <tmtc/pusIds.h>
diff --git a/mission/controller/CMakeLists.txt b/mission/controller/CMakeLists.txt
index cdcd8ddd..816a560a 100644
--- a/mission/controller/CMakeLists.txt
+++ b/mission/controller/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(TGT_BSP MATCHES "arm/q7s")
+if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "")
 	target_sources(${LIB_EIVE_MISSION} PRIVATE ThermalController.cpp)
 endif()