diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/devices/ploc/PlocMPSoCHandler.cpp
index b1914111..f4915c55 100644
--- a/linux/devices/ploc/PlocMPSoCHandler.cpp
+++ b/linux/devices/ploc/PlocMPSoCHandler.cpp
@@ -289,9 +289,9 @@ void PlocMPSoCHandler::fillCommandAndReplyMap() {
   this->insertInCommandMap(mpsoc::RELEASE_UART_TX);
   this->insertInCommandMap(mpsoc::SET_UART_TX_TRISTATE);
   this->insertInReplyMap(mpsoc::ACK_REPORT, 3, nullptr, mpsoc::SIZE_ACK_REPORT);
-  this->insertInReplyMap(mpsoc::EXE_REPORT, 3, nullptr, mpsoc::SIZE_EXE_REPORT);
+  this->insertInReplyMap(mpsoc::EXE_REPORT, 50, nullptr, mpsoc::SIZE_EXE_REPORT);
   this->insertInReplyMap(mpsoc::TM_MEMORY_READ_REPORT, 2, nullptr, mpsoc::SIZE_TM_MEM_READ_REPORT);
-  this->insertInReplyMap(mpsoc::TM_CAM_CMD_RPT, 2, nullptr, mpsoc::SP_MAX_SIZE);
+  this->insertInReplyMap(mpsoc::TM_CAM_CMD_RPT, 50, nullptr, mpsoc::SP_MAX_SIZE);
 }
 
 ReturnValue_t PlocMPSoCHandler::scanForReply(const uint8_t* start, size_t remainingSize,
@@ -533,7 +533,7 @@ ReturnValue_t PlocMPSoCHandler::prepareTcCamCmdSend(const uint8_t* commandData,
     return result;
   }
   finishTcPrep(tcCamCmdSend.getFullPacketLen());
-  nextReplyId = mpsoc::TM_CAM_CMD_RPT;
+  nextReplyId = mpsoc::ACK_REPORT;
   return returnvalue::OK;
 }
 
@@ -769,6 +769,9 @@ void PlocMPSoCHandler::setNextReplyId() {
     case mpsoc::TC_MEM_READ:
       nextReplyId = mpsoc::TM_MEMORY_READ_REPORT;
       break;
+    case mpsoc::TC_CAM_CMD_SEND:
+      nextReplyId = mpsoc::TM_CAM_CMD_RPT;
+      break;
     default:
       /* If no telemetry is expected the next reply is always the execution report */
       nextReplyId = mpsoc::EXE_REPORT;
diff --git a/mission/controller/acs/ActuatorCmd.cpp b/mission/controller/acs/ActuatorCmd.cpp
index 457cacce..d2fe2d65 100644
--- a/mission/controller/acs/ActuatorCmd.cpp
+++ b/mission/controller/acs/ActuatorCmd.cpp
@@ -49,7 +49,7 @@ void ActuatorCmd::cmdSpeedToRws(int32_t speedRw0, int32_t speedRw1, int32_t spee
     } else if (rwCmdSpeed[i] < -maxRwSpeed) {
       rwCmdSpeed[i] = -maxRwSpeed;
     }
-    }
+  }
 }
 
 void ActuatorCmd::cmdDipolMtq(const double *dipolMoment, int16_t *dipolMomentActuator,
diff --git a/tmtc b/tmtc
index a40c881b..d8367f7e 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit a40c881b9fc292fe598204280db38720a784b71f
+Subproject commit d8367f7e62a47516d7772c129c18ee8f7b07703b