diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp
index 4b0639f7..ca7271ce 100644
--- a/bsp_q7s/core/obsw.cpp
+++ b/bsp_q7s/core/obsw.cpp
@@ -13,7 +13,7 @@
 static int OBSW_ALREADY_RUNNING = -2;
 
 int obsw::obsw() {
-  fsfw::Version version;
+  using namespace fsfw;
   fsfw::getVersion(version);
   std::cout << "-- EIVE OBSW --" << std::endl;
 #if BOARD_TE0720 == 0
@@ -22,8 +22,8 @@ int obsw::obsw() {
   std::cout << "-- Compiled for Linux (TE0720) --" << std::endl;
 #endif
   std::cout << "-- OBSW v" << SW_VERSION << "." << SW_SUBVERSION << "." << SW_REVISION << ", FSFW v"
-            << version.major << "." << version.minor << "." << version.revision << "--"
-            << std::endl;
+            << FSFW_VERSION.major << "." << FSFW_VERSION.minor << "." << FSFW_VERSION.revision
+            << "--" << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
 
 #if Q7S_CHECK_FOR_ALREADY_RUNNING_IMG == 1
diff --git a/tmtc b/tmtc
index de68ad93..eedb45e4 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit de68ad9341fbe5570b84305f33562702e3486364
+Subproject commit eedb45e4f34bd77d328745808e9acfe4668a1e35