diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp
index 4494655..a79f390 100644
--- a/bsp_hosted/core/ObjectFactory.cpp
+++ b/bsp_hosted/core/ObjectFactory.cpp
@@ -52,9 +52,8 @@ void ObjectFactory::produce(void* args) {
                                           {30, 128}, {20, 1024}, {10, 2048}};
     new PoolManager(objects::IPC_STORE, poolCfg);
   }
-  TmFunnel* funnel;
+  PusTmFunnel* funnel;
   CcsdsDistributor* ccsdsDistrib;
-  ObjectFactory::produceGenericObjects(&funnel, &ccsdsDistrib, *tcStore, *tmStore);
   // TMTC Reception via TCP/IP socket
 #if OBSW_USE_TCP_SERVER == 0
   auto tmtcBridge = new UdpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR);
@@ -68,6 +67,7 @@ void ObjectFactory::produce(void* args) {
   sif::info << "Opening TCP TMTC server on port " << tmtcServer->getTcpPort() << std::endl;
   // TODO: Set the set of valid space packet IDs. Otherwise, parsing might fail
 #endif
+  ObjectFactory::produceGenericObjects(&funnel, *tmtcBridge, &ccsdsDistrib, *tcStore, *tmStore);
 
 #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
 
diff --git a/example_common b/example_common
index 6bcd0ce..7bb9ffc 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit 6bcd0ce05f31fbc8b2d49205a1a90071442dbdd0
+Subproject commit 7bb9ffc3f73bcfefa030b2546382fc6353702096
diff --git a/fsfw b/fsfw
index 14a8924..1aa062d 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 14a8924a83dc15e29cd4bf8c6ac495c8729e4828
+Subproject commit 1aa062df7fc43135b8e45115eef45d45afca5a81