diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp
index e13ac9c..321c80b 100644
--- a/bsp_hosted/core/ObjectFactory.cpp
+++ b/bsp_hosted/core/ObjectFactory.cpp
@@ -59,7 +59,7 @@ void ObjectFactory::produce(void* args) {
     auto tmtcBridge = new TcpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR);
     tmtcBridge->setMaxNumberOfPacketsStored(50);
     auto tmtcServer = new TcpTmTcServer(objects::TCPIP_TMTC_POLLING_TASK, objects::TCPIP_TMTC_BRIDGE);
-    sif::info << "Opening UDP TMTC server on port " << tmtcServer->getTcpPort() << std::endl;
+    sif::info << "Opening TCP TMTC server on port " << tmtcServer->getTcpPort() << std::endl;
 #endif
 
 #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
diff --git a/fsfw b/fsfw
index 80cad3e..5284ead 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 80cad3ed3f0c95c87d904c212ca2e03a01231c1f
+Subproject commit 5284eadca64199ed48fee02fd30882735f13b6c6
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 4a5edad..8f2289c 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 4a5edad2c5bbd13d5e31471eb51a5f83cb74f8b0
+Subproject commit 8f2289ceef004334401127e8a756cb2d49b1ad0c