diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index c155e705..9ee96b37 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -187,8 +187,9 @@ void ObjectFactory::produce(void* args) {
 
 #if OBSW_ADD_STAR_TRACKER == 1
   UartCookie* starTrackerCookie =
-      new UartCookie(objects::STAR_TRACKER, q7s::UART_STAR_TRACKER_DEV, UartModes::NON_CANONICAL,
-                     uart::STAR_TRACKER_BAUD, startracker::MAX_FRAME_SIZE * 2 + 2);
+      new UartCookie(objects::STAR_TRACKER, q7s::UART_STAR_TRACKER_DEV,
+                     uart::STAR_TRACKER_BAUD, startracker::MAX_FRAME_SIZE * 2 + 2,
+                     UartModes::NON_CANONICAL);
   starTrackerCookie->setNoFixedSizeReply();
   StrHelper* strHelper = new StrHelper(objects::STR_HELPER);
   new StarTrackerHandler(objects::STAR_TRACKER, objects::UART_COM_IF, starTrackerCookie, strHelper,
@@ -627,8 +628,8 @@ void ObjectFactory::createSolarArrayDeploymentComponents() {
 
 void ObjectFactory::createSyrlinksComponents() {
   UartCookie* syrlinksUartCookie =
-      new UartCookie(objects::SYRLINKS_HK_HANDLER, q7s::UART_SYRLINKS_DEV, UartModes::NON_CANONICAL,
-                     uart::SYRLINKS_BAUD, syrlinks::MAX_REPLY_SIZE);
+      new UartCookie(objects::SYRLINKS_HK_HANDLER, q7s::UART_SYRLINKS_DEV,
+                     uart::SYRLINKS_BAUD, syrlinks::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
   syrlinksUartCookie->setParityEven();
 
   new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie,
@@ -647,7 +648,7 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
   gpioComIF->addGpios(mpsocGpioCookie);
   auto mpsocCookie =
       new UartCookie(objects::PLOC_MPSOC_HANDLER, q7s::UART_PLOC_MPSOC_DEV,
-                     UartModes::NON_CANONICAL, uart::PLOC_MPSOC_BAUD, mpsoc::MAX_REPLY_SIZE);
+                     uart::PLOC_MPSOC_BAUD, mpsoc::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
   mpsocCookie->setNoFixedSizeReply();
   auto plocMpsocHelper = new PlocMPSoCHelper(objects::PLOC_MPSOC_HELPER);
   new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, mpsocCookie,
@@ -663,8 +664,9 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
   supvGpioCookie->addGpio(gpioIds::ENABLE_SUPV_UART, gpioConfigSupv);
   gpioComIF->addGpios(supvGpioCookie);
   auto supervisorCookie = new UartCookie(objects::PLOC_SUPERVISOR_HANDLER,
-                                         q7s::UART_PLOC_SUPERVSIOR_DEV, UartModes::NON_CANONICAL,
-                                         uart::PLOC_SUPERVISOR_BAUD, supv::MAX_PACKET_SIZE * 20);
+                                         q7s::UART_PLOC_SUPERVSIOR_DEV,
+                                         uart::PLOC_SUPERVISOR_BAUD, supv::MAX_PACKET_SIZE * 20,
+                                         UartModes::NON_CANONICAL);
   supervisorCookie->setNoFixedSizeReply();
   new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, objects::UART_COM_IF,
                             supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),