diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 1c5bb2df..760e2a4a 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -154,8 +154,14 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_PLOC_MPSOC == 1
     UartCookie* plocMpsocCookie = new UartCookie(objects::PLOC_MPSOC_HANDLER,
             q7s::UART_PLOC_MPSOC_DEV, UartModes::NON_CANONICAL, uart::PLOC_MPSOC_BAUD,
+<<<<<<< Updated upstream
             PLOC_MPSOC::MAX_REPLY_SIZE);
     new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, plocMpsocCookie);
+=======
+            mpsoc::MAX_REPLY_SIZE);
+    PlocMPSoCHandler* plocMpsocHandler = new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, plocMpsocCookie);
+    plocMpsocHandler->setStartUpImmediately();
+>>>>>>> Stashed changes
 #endif /* OBSW_ADD_PLOC_MPSOC == 1 */
 
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
diff --git a/mission/devices/SyrlinksHkHandler.h b/mission/devices/SyrlinksHkHandler.h
index c194fd18..f30fb5bb 100644
--- a/mission/devices/SyrlinksHkHandler.h
+++ b/mission/devices/SyrlinksHkHandler.h
@@ -61,10 +61,10 @@ private:
 
 	std::string resetCommand = "<C04:5A5A:FF41>";
 	std::string readRxStatusRegCommand = "<E00::825B>";
-	std::string setTxModeStandby = "<W04:0040:2B9E>";
+	std::string setTxModeStandby = "<W04:4000:BE2A>";
 	/** W - write, 04 - 4 bytes in data field, 01 - value, 40 register to write value */
-	std::string setTxModeModulation = "<W04:0140:5D2A>";
-	std::string setTxModeCw = "<W04:1040:81CF>";
+	std::string setTxModeModulation = "<W04:4001:5123>";
+	std::string setTxModeCw = "<W04:4010:4968>";
 	std::string readTxStatus = "<R02:40:7555>";
 	std::string readTxWaveform = "<R02:44:B991>";
 	std::string readTxAgcValueHighByte = "<R02:46:DFF3>";
diff --git a/mission/devices/devicedefinitions/SyrlinksDefinitions.h b/mission/devices/devicedefinitions/SyrlinksDefinitions.h
index 7aa75b99..43ce16f2 100644
--- a/mission/devices/devicedefinitions/SyrlinksDefinitions.h
+++ b/mission/devices/devicedefinitions/SyrlinksDefinitions.h
@@ -21,7 +21,7 @@ namespace SYRLINKS {
     static const DeviceCommandId_t READ_TX_AGC_VALUE_LOW_BYTE = 0x0A;
 
     /** Size of a simple transmission success response */
-    static const uint8_t ACK_SIZE = 11;
+    static const uint8_t ACK_SIZE = 12;
     static const uint8_t SIZE_CRC_AND_TERMINATION = 5;
     /** The size of the header with the message identifier and the payload size field */
     static const uint8_t MESSAGE_HEADER_SIZE = 5;
diff --git a/tmtc b/tmtc
index 734dc5ae..5816f05c 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 734dc5aef88d9fef4ad59817b6ea315db954205c
+Subproject commit 5816f05ccf8971f3cf2dd1d603dd3f5a33f6f504