diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0287ef2..1d283085 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,13 +99,13 @@ set(OBSW_ADD_GPS_CTRL
     ${INIT_VAL}
     CACHE STRING "Add GPS controllers")
 set(OBSW_ADD_CCSDS_IP_CORES
-    ${INIT_VAL}
+    1
     CACHE STRING "Add CCSDS IP cores")
 set(OBSW_TM_TO_PTME
-    ${INIT_VAL}
+    1
     CACHE STRING "Send telemetry to PTME IP core")
 set(OBSW_TC_FROM_PDEC
-    ${INIT_VAL}
+    1
     CACHE STRING "Poll telecommand from PDEC IP core")
 set(OBSW_ADD_TCS_CTRL
     ${INIT_VAL}
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 4fd6df50..13ae55d6 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -51,7 +51,7 @@ void ObjectFactory::produce(void* args) {
   // createPayloadComponents(gpioComIF);
   // createHeaterComponents(gpioComIF, pwrSwitcher, healthTable);
 
-  // TODO: Careful! Swichting this on somehow messes with the communication with the ProASIC
+  // TODO: Careful! Switching this on somehow messes with the communication with the ProASIC
   //       and will cause xsc_boot_copy commands to always boot to 0 0
   // createRadSensorComponent(gpioComIF);