diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp
index 7b2313d..4494655 100644
--- a/bsp_hosted/core/ObjectFactory.cpp
+++ b/bsp_hosted/core/ObjectFactory.cpp
@@ -66,6 +66,7 @@ void ObjectFactory::produce(void* args) {
   tmtcBridge->setMaxNumberOfPacketsStored(50);
   auto tmtcServer = new TcpTmTcServer(objects::TCPIP_TMTC_POLLING_TASK, objects::TCPIP_TMTC_BRIDGE);
   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
 
 #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
diff --git a/example_common b/example_common
index d959489..6bcd0ce 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit d959489cf39b2b1f5c51e3045d33cdcb3f597daa
+Subproject commit 6bcd0ce05f31fbc8b2d49205a1a90071442dbdd0
diff --git a/tmtc/deps/tmtccmd b/tmtc/deps/tmtccmd
index dc98ef0..96ca55b 160000
--- a/tmtc/deps/tmtccmd
+++ b/tmtc/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit dc98ef09b0c3b7aaaa89163bc94be59547b77cbb
+Subproject commit 96ca55b17a823ce10307e8aa6d8cd906323d1ae5