diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0f3b1a4..54ad61e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,7 +6,7 @@
     <codeStyleSettings language="CMake">
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="0" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
         <option name="TAB_SIZE" value="2" />
       </indentOptions>
     </codeStyleSettings>
diff --git a/bsp_hosted/core/InitMission.cpp b/bsp_hosted/core/InitMission.cpp
index 177dffe..e0d4816 100644
--- a/bsp_hosted/core/InitMission.cpp
+++ b/bsp_hosted/core/InitMission.cpp
@@ -95,8 +95,7 @@ void InitMission::createTasks() {
   result = pst::pollingSequenceExamples(timeslotDemoTask);
   if (result != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "InitMission::createTasks: Timeslot demo task initialization failed!"
-               << std::endl;
+    std::cerr << "InitMission::createTasks: Timeslot demo task initialization failed!" << std::endl;
 #else
     sif::printError("InitMission::createTasks: Timeslot demo task initialization failed!\n");
 #endif
@@ -188,7 +187,7 @@ void InitMission::createTasks() {
   result = pst::pollingSequenceDevices(testDevicesTimeslotTask);
   if (result != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "InitMission::createTasks: Test PST initialization failed!" << std::endl;
+    std::cerr << "InitMission::createTasks: Test PST initialization failed!" << std::endl;
 #else
     sif::printError("InitMission::createTasks: Test PST initialization failed!\n");
 #endif
@@ -231,7 +230,7 @@ void InitMission::createTasks() {
   }
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-  sif::info << "Starting tasks.." << std::endl;
+  std::cout << "Starting tasks.." << std::endl;
 #else
   sif::printInfo("Starting tasks..\n");
 #endif
@@ -267,7 +266,7 @@ void InitMission::createTasks() {
   testTask->startTask();
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-  sif::info << "Tasks started.." << std::endl;
+  std::cout << "Tasks started.." << std::endl;
 #else
   sif::printInfo("Tasks started..\n");
 #endif
diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp
index 0052aa6..0b3e097 100644
--- a/bsp_hosted/core/ObjectFactory.cpp
+++ b/bsp_hosted/core/ObjectFactory.cpp
@@ -46,7 +46,7 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_USE_TCP_SERVER == 0
   auto tmtcBridge = new UdpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR);
   tmtcBridge->setMaxNumberOfPacketsStored(50);
-  sif::info << "Opening UDP TMTC server on port " << tmtcBridge->getUdpPort() << std::endl;
+  std::cout << "Opening UDP TMTC server on port " << tmtcBridge->getUdpPort() << std::endl;
   new UdpTcPollingTask(objects::TCPIP_TMTC_POLLING_TASK, objects::TCPIP_TMTC_BRIDGE);
 #else
   auto tmtcBridge = new TcpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR);
diff --git a/bsp_hosted/main.cpp b/bsp_hosted/main.cpp
index 3506181..647e626 100644
--- a/bsp_hosted/main.cpp
+++ b/bsp_hosted/main.cpp
@@ -1,6 +1,5 @@
 #include <bsp_hosted/core/InitMission.h>
 #include <bsp_hosted/core/ObjectFactory.h>
-
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/platform.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
@@ -21,17 +20,17 @@ static const char* COMPILE_PRINTOUT = "unknown OS";
 #endif
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-ServiceInterfaceStream sif::debug("DEBUG", false);
-ServiceInterfaceStream sif::info("INFO", false);
-ServiceInterfaceStream sif::warning("WARNING", false);
-ServiceInterfaceStream sif::error("ERROR", false, true, true);
+// ServiceInterfaceStream sif::debug("DEBUG", false);
+// ServiceInterfaceStream sif::info("INFO", false);
+// ServiceInterfaceStream sif::warning("WARNING", false);
+// ServiceInterfaceStream sif::error("ERROR", false, true, true);
 #endif
 
 int main() {
   utility::commonInitPrint("Hosted", COMPILE_PRINTOUT);
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-  sif::info << "Producing system objects.." << std::endl;
+  std::cout << "Producing system objects.." << std::endl;
 #else
   sif::printInfo("Producing system objects..\n");
 #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
@@ -40,8 +39,8 @@ int main() {
   objManager->setObjectFactoryFunction(ObjectFactory::produce, nullptr);
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-  sif::info << "Objects created successfully.." << std::endl;
-  sif::info << "Initializing objects.." << std::endl;
+  std::cout << "Objects created successfully.." << std::endl;
+  std::cout << "Initializing objects.." << std::endl;
 #else
   sif::printInfo("Objects created successfully..\n");
 #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
@@ -49,7 +48,7 @@ int main() {
   objManager->initialize();
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-  sif::info << "Creating tasks.." << std::endl;
+  std::cout << "Creating tasks.." << std::endl;
 #else
   sif::printInfo("Creating tasks..\n");
 #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
diff --git a/example_common b/example_common
index ca50127..6f2e03f 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit ca501272d839a41c1f6a8d298941905fb99a0877
+Subproject commit 6f2e03f0031fd54eb89ed0a12996400868ee7d7f
diff --git a/fsfw b/fsfw
index 1a07864..83a2882 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 1a07864a5faf0ceba707b3174172e133e083ff53
+Subproject commit 83a2882f9d46df5bd480f3ac9e6f9d85dc7f4dcc