diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 14f1b34b..42665293 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -570,12 +570,8 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF *gpioComIF, UartComI
     resetArgsGnss0.gnss1 = false;
     resetArgsGnss0.gpioComIF = gpioComIF;
     resetArgsGnss0.waitPeriodMs = 100;
-    auto uartCookieGps0 = new UartCookie(objects::GPS0_HANDLER, q7s::UART_GNSS_DEV,
-            UartModes::CANONICAL, uart::GNSS_BAUD, uart::HYPERION_GPS_REPLY_MAX_BUFFER);
-    uartCookieGps0->setToFlushInput(true);
-    uartCookieGps0->setReadCycles(6);
-    auto gpsHandler0 = new GPSHyperionHandler(objects::GPS0_HANDLER, objects::UART_COM_IF,
-            uartCookieGps0, debugGps);
+    auto gpsHandler0 = new GPSHyperionHandler(objects::GPS0_HANDLER, objects::NO_OBJECT,
+            debugGps);
     gpsHandler0->setResetPinTriggerFunction(gps::triggerGpioResetPin, &resetArgsGnss0);
 }
 
diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in
index 4a7bca35..51a04e16 100644
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -109,7 +109,7 @@ debugging. */
 #define OBSW_DEBUG_STARTRACKER                      0
 #define OBSW_DEBUG_PLOC_MPSOC                       0
 #define OBSW_DEBUG_PLOC_SUPERVISOR                  0
-#define OBSW_DEBUG_PDEC_HANDLER	                    1
+#define OBSW_DEBUG_PDEC_HANDLER	                    0
 
 /*******************************************************************/
 /** Hardcoded                                                      */
diff --git a/mission/devices/GPSHyperionHandler.cpp b/mission/devices/GPSHyperionHandler.cpp
index 58491332..3a2253e6 100644
--- a/mission/devices/GPSHyperionHandler.cpp
+++ b/mission/devices/GPSHyperionHandler.cpp
@@ -9,8 +9,8 @@
 #include <fstream>
 #endif
 
-GPSHyperionHandler::GPSHyperionHandler(object_id_t objectId, object_id_t deviceCommunication,
-        CookieIF *comCookie, bool debugHyperionGps):
+GPSHyperionHandler::GPSHyperionHandler(object_id_t objectId, object_id_t parentId,
+        bool debugHyperionGps):
         ExtendedControllerBase(objectId, objects::NO_OBJECT), gpsSet(this),
         debugHyperionGps(debugHyperionGps) {
 }
diff --git a/mission/devices/GPSHyperionHandler.h b/mission/devices/GPSHyperionHandler.h
index 62ec4d01..240fe480 100644
--- a/mission/devices/GPSHyperionHandler.h
+++ b/mission/devices/GPSHyperionHandler.h
@@ -16,8 +16,8 @@
 class GPSHyperionHandler: public ExtendedControllerBase {
 public:
 
-	GPSHyperionHandler(object_id_t objectId, object_id_t deviceCommunication,
-	        CookieIF* comCookie, bool debugHyperionGps = false);
+	GPSHyperionHandler(object_id_t objectId, object_id_t parentId,
+	        bool debugHyperionGps = false);
 	virtual ~GPSHyperionHandler();
 
     using gpioResetFunction_t = ReturnValue_t (*) (void* args);