diff --git a/common/config/devConf.h b/common/config/devConf.h
index 7e09b50f..abb3b3e1 100644
--- a/common/config/devConf.h
+++ b/common/config/devConf.h
@@ -3,6 +3,7 @@
 
 #include <cstdint>
 #include <fsfw_hal/linux/spi/spiDefinitions.h>
+#include <fsfw_hal/linux/uart/UartCookie.h>
 
 /**
  * SPI configuration will be contained here to let the device handlers remain independent
@@ -49,11 +50,11 @@ static constexpr spi::SpiModes RTD_MODE = spi::SpiModes::MODE_3;
 namespace uart {
 
 static constexpr size_t HYPERION_GPS_REPLY_MAX_BUFFER = 1024;
-static constexpr uint32_t SYRLINKS_BAUD = 38400;
-static constexpr uint32_t GNSS_BAUD = 9600;
-static constexpr uint32_t PLOC_MPSOC_BAUD = 115200;
-static constexpr uint32_t PLOC_SUPERVISOR_BAUD = 115200;
-static constexpr uint32_t STAR_TRACKER_BAUD = 921600;
+static constexpr UartBaudRate SYRLINKS_BAUD = UartBaudRate::RATE_38400;
+static constexpr UartBaudRate GNSS_BAUD = UartBaudRate::RATE_9600;
+static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
+static constexpr UartBaudRate PLOC_SUPERVISOR_BAUD = UartBaudRate::RATE_115200;
+static constexpr UartBaudRate STAR_TRACKER_BAUD = UartBaudRate::RATE_921600;
 
 }
 
diff --git a/fsfw b/fsfw
index 85a6e4b1..6ce09e96 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 85a6e4b12977f24247ed3ca3011c6f8b611a144e
+Subproject commit 6ce09e968d30997f8e3e82e16aef7ca19e19f5eb
diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index d1ef7d1b..20860211 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -3,7 +3,6 @@
 #include "OBSWConfig.h"
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/timemanager/Clock.h"
-
 #include "linux/utility/utility.h"
 #include "mission/utility/compileTime.h"
 
diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp
index d37673fc..508471d2 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@@ -111,7 +111,7 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
   dataOffset += 6;
   coreHk.bootCount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
                      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  if(firstHk) {
+  if (firstHk) {
     triggerEvent(P60_BOOT_COUNT, coreHk.bootCount.value);
   }
   dataOffset += 6;
diff --git a/tmtc b/tmtc
index 3a1c7c62..98783a09 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 3a1c7c62887eb377c498bd9cdac47b93f40c85ba
+Subproject commit 98783a0981b2a23d8f4dbfa8706b8826b8194231