diff --git a/bsp_linux_board/InitMission.cpp b/bsp_linux_board/InitMission.cpp
index 154797dc..e08d73ca 100644
--- a/bsp_linux_board/InitMission.cpp
+++ b/bsp_linux_board/InitMission.cpp
@@ -117,6 +117,10 @@ void initmission::initTasks() {
     if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS20", objects::PUS_SERVICE_20_PARAMETERS);
     }
+    result = pusMedPrio->addComponent(objects::PUS_SERVICE_3_HOUSEKEEPING);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
+        initmission::printAddObjectError("PUS3", objects::PUS_SERVICE_3_HOUSEKEEPING);
+    }
 
     PeriodicTaskIF* pusLowPrio = factory->createPeriodicTask(
             "PUS_LOW_PRIO", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.6, missedDeadlineFunc);
@@ -124,6 +128,11 @@ void initmission::initTasks() {
     if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("PUS17", objects::PUS_SERVICE_17_TEST);
     }
+    result = pusLowPrio->addComponent(objects::INTERNAL_ERROR_REPORTER);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
+        initmission::printAddObjectError("INT_ERR_RPRT",
+                objects::INTERNAL_ERROR_REPORTER);
+    }
 
 #if OBSW_ADD_TEST_PST == 1
     FixedTimeslotTaskIF* pstTestTask = factory->createFixedTimeslotTask(
diff --git a/bsp_linux_board/ObjectFactory.cpp b/bsp_linux_board/ObjectFactory.cpp
index 21a2ec07..57e57531 100644
--- a/bsp_linux_board/ObjectFactory.cpp
+++ b/bsp_linux_board/ObjectFactory.cpp
@@ -45,8 +45,6 @@ void Factory::setStaticFrameworkObjectIds() {
     // No storage object for now.
     TmFunnel::storageDestination = objects::NO_OBJECT;
 
-    LocalDataPoolManager::defaultHkDestination = objects::NO_OBJECT;
-
     VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
     TmPacketBase::timeStamperId = objects::TIME_STAMPER;
 }