diff --git a/fsfw b/fsfw
index 9fca7581..6650c293 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 9fca7581dd75d074df343802c922e48f95b677eb
+Subproject commit 6650c293da09d8851c2bd6c4d6e6c5a8390d003e
diff --git a/mission/system/CMakeLists.txt b/mission/system/CMakeLists.txt
index f278bbc9..44122d7e 100644
--- a/mission/system/CMakeLists.txt
+++ b/mission/system/CMakeLists.txt
@@ -3,5 +3,6 @@ add_subdirectory(tree)
 add_subdirectory(acs)
 add_subdirectory(com)
 add_subdirectory(fdir)
+add_subdirectory(power)
 
 target_sources(${LIB_EIVE_MISSION} PRIVATE DualLanePowerStateMachine.cpp)
diff --git a/mission/system/power/CMakeLists.txt b/mission/system/power/CMakeLists.txt
index fb737a3f..8fa4967e 100644
--- a/mission/system/power/CMakeLists.txt
+++ b/mission/system/power/CMakeLists.txt
@@ -1,2 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE RtdFdir.cpp StrFdir.cpp
-                                           GomspacePowerFdir.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE GomspacePowerFdir.cpp)
diff --git a/tmtc b/tmtc
index 6975fae5..50668ca7 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 6975fae511ca7b2fdef70858f8715908f300f434
+Subproject commit 50668ca7a74edd4219456e393cd10f7858591130