diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp
index 927381c8..2967e139 100644
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@@ -230,8 +230,10 @@ void initmission::createPstTasks(TaskFactory& factory,
       "PST_TASK_DEFAULT", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.5, missedDeadlineFunc);
   result = pst::pstSpi(spiPst);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    if (result != FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
-      sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
+    if (result == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
+      sif::warning << "InitMission::initTasks: SPI PST is empty" << std::endl;
+    } else {
+      sif::error << "InitMission::initTasks: Creating SPI PST failed!" << std::endl;
     }
   } else {
     taskVec.push_back(spiPst);
@@ -242,32 +244,49 @@ void initmission::createPstTasks(TaskFactory& factory,
       "UART_PST", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.2, missedDeadlineFunc);
   result = pst::pstUart(uartPst);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
+    if (result == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
+      sif::warning << "InitMission::initTasks: UART PST is empty" << std::endl;
+    } else {
+      sif::error << "InitMission::initTasks: Creating UART PST failed!" << std::endl;
+    }
+  } else {
+    taskVec.push_back(uartPst);
   }
-  taskVec.push_back(uartPst);
+
   FixedTimeslotTaskIF* gpioPst = factory.createFixedTimeslotTask(
       "GPIO_PST", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.2, missedDeadlineFunc);
   result = pst::pstGpio(gpioPst);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
+    if (result == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
+      sif::warning << "InitMission::initTasks: GPIO PST is empty" << std::endl;
+    } else {
+      sif::error << "InitMission::initTasks: Creating GPIO PST failed!" << std::endl;
+    }
+  } else {
+    taskVec.push_back(gpioPst);
   }
-  taskVec.push_back(gpioPst);
-
 #if OBSW_ADD_I2C_TEST_CODE == 0
   FixedTimeslotTaskIF* i2cPst = factory.createFixedTimeslotTask(
       "I2C_PST", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.2, missedDeadlineFunc);
   result = pst::pstI2c(i2cPst);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
+    if (result == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
+      sif::warning << "InitMission::initTasks: I2C PST is empty" << std::endl;
+    } else {
+      sif::error << "InitMission::initTasks: Creating I2C PST failed!" << std::endl;
+    }
+  } else {
+    taskVec.push_back(i2cPst);
   }
-  taskVec.push_back(i2cPst);
 #endif
 
   FixedTimeslotTaskIF* gomSpacePstTask = factory.createFixedTimeslotTask(
       "GS_PST_TASK", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 1.0, missedDeadlineFunc);
   result = pst::pstGompaceCan(gomSpacePstTask);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    sif::error << "InitMission::initTasks: GomSpace PST initialization failed!" << std::endl;
+    if (result != FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
+      sif::error << "InitMission::initTasks: GomSpace PST initialization failed!" << std::endl;
+    }
   }
   taskVec.push_back(gomSpacePstTask);
 #else  /* BOARD_TE7020 == 0 */
diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
index 62ea6296..71fbf789 100644
--- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
+++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
@@ -365,7 +365,7 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
 
 #if OBSW_ADD_ACS_BOARD == 1 && OBSW_ADD_ACS_HANDLERS == 1
   bool enableAside = true;
-  bool enableBside = true;
+  bool enableBside = false;
   if (enableAside) {
     // A side
     thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0,
@@ -431,17 +431,7 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   }
 #endif /* OBSW_ADD_ACS_BOARD == 1 && OBSW_ADD_ACS_HANDLERS == 1 */
 
-  ReturnValue_t seqCheck = thisSequence->checkSequence();
-  if (seqCheck != HasReturnvaluesIF::RETURN_OK) {
-    if (seqCheck == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
-      sif::warning << "SPI PST is empty.." << std::endl;
-    } else {
-      sif::error << "SPI PST initialization failed" << std::endl;
-    }
-
-    return seqCheck;
-  }
-  return HasReturnvaluesIF::RETURN_OK;
+  return thisSequence->checkSequence();
 }
 
 ReturnValue_t pst::pstI2c(FixedTimeslotTaskIF *thisSequence) {
@@ -463,11 +453,7 @@ ReturnValue_t pst::pstI2c(FixedTimeslotTaskIF *thisSequence) {
   thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * 0.8, DeviceHandlerIF::GET_READ);
 #endif
   static_cast<void>(length);
-  if (thisSequence->checkSequence() != HasReturnvaluesIF::RETURN_OK) {
-    sif::error << "I2C PST initialization failed" << std::endl;
-    return HasReturnvaluesIF::RETURN_FAILED;
-  }
-  return HasReturnvaluesIF::RETURN_OK;
+  return thisSequence->checkSequence();
 }
 
 ReturnValue_t pst::pstUart(FixedTimeslotTaskIF *thisSequence) {
diff --git a/scripts/q7s-port.sh b/scripts/q7s-port.sh
index 70f46a89..daa4ff4f 100755
--- a/scripts/q7s-port.sh
+++ b/scripts/q7s-port.sh
@@ -4,7 +4,7 @@ echo "-L 1534:192.168.155.55:1534 for connection to the TCF agent on the FM"
 echo "-L 1535:192.168.155.55:22 for file transfers to the FM"
 echo "-L 1536:192.168.155.55:7301 for TMTC commanding using the TCP/IP IF on the FM"
 echo "-L 1537:127.0.0.1:7100 for TMTC commanding using the CCSDS IF"
-echo "-L 1538:192.168.133.10:1543 for connection to the TCF agent on the EM"
+echo "-L 1538:192.168.133.10:1534 for connection to the TCF agent on the EM"
 echo "-L 1539:192.168.133.10:22 for file transfers to the EM"
 echo "-L 1540:192.168.133.10:7301 for TMTC commanding using the TCP/IP IF on the EM"
 
@@ -12,7 +12,7 @@ ssh -L 1534:192.168.155.55:1534 \
    -L 1535:192.168.155.55:22 \
    -L 1536:192.168.155.55:7301 \
    -L 1537:127.0.0.1:7100 \
-   -L 1538:192.168.133.10:1543 \
+   -L 1538:192.168.133.10:1534 \
    -L 1539:192.168.133.10:22 \
    -L 1540:192.168.133.10:7301 \
    eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 \
diff --git a/tmtc b/tmtc
index eedb45e4..b6360b9c 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit eedb45e4f34bd77d328745808e9acfe4668a1e35
+Subproject commit b6360b9c5c28bd1b78c5a8ceef2fbae0799d967a