diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp
index d0224d2c..bf6bb2ca 100644
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@@ -117,7 +117,7 @@ void initmission::initTasks() {
 
 #if OBSW_ADD_ACS_HANDLERS == 1
   PeriodicTaskIF* acsCtrl = factory->createPeriodicTask(
-      "ACS_CTRL", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.4, missedDeadlineFunc);
+      "ACS_CTRL", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
   result = acsCtrl->addComponent(objects::GPS_CONTROLLER);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     initmission::printAddObjectError("ACS_CTRL", objects::GPS_CONTROLLER);
@@ -136,10 +136,10 @@ void initmission::initTasks() {
 
 #if OBSW_ADD_STAR_TRACKER == 1
   PeriodicTaskIF* strImgLoaderTask = factory->createPeriodicTask(
-      "FILE_SYSTEM_TASK", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
+      "STR_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
   result = strImgLoaderTask->addComponent(objects::STR_HELPER);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    initmission::printAddObjectError("FILE_SYSTEM_TASK", objects::STR_HELPER);
+    initmission::printAddObjectError("STR_HELPER", objects::STR_HELPER);
   }
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
diff --git a/mission/devices/GPSHyperionHandler.cpp b/mission/devices/GPSHyperionHandler.cpp
index 2898dc92..0517f296 100644
--- a/mission/devices/GPSHyperionHandler.cpp
+++ b/mission/devices/GPSHyperionHandler.cpp
@@ -4,11 +4,6 @@
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/timemanager/Clock.h"
 
-#ifdef FSFW_OSAL_LINUX
-#include <gps.h>
-#include <libgpsmm.h>
-#endif
-
 #include <cmath>
 
 #if FSFW_DEV_HYPERION_GPS_CREATE_NMEA_CSV == 1
@@ -20,6 +15,7 @@ GPSHyperionHandler::GPSHyperionHandler(object_id_t objectId, object_id_t parentI
                                        bool debugHyperionGps)
     : ExtendedControllerBase(objectId, objects::NO_OBJECT),
       gpsSet(this),
+      myGpsmm(GPSD_SHARED_MEMORY, nullptr),
       debugHyperionGps(debugHyperionGps) {}
 
 GPSHyperionHandler::~GPSHyperionHandler() {}
@@ -97,15 +93,14 @@ ReturnValue_t GPSHyperionHandler::handleCommandMessage(CommandMessage *message)
 void GPSHyperionHandler::readGpsDataFromGpsd() {
   // The data from the device will generally be read all at once. Therefore, we
   // can set all field here
-  gpsmm gpsmm(GPSD_SHARED_MEMORY, 0);
-  if(not gpsmm.is_open()) {
+  if(not myGpsmm.is_open()) {
     // Opening failed
 #if FSFW_VERBOSE_LEVEL >= 1
     sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Opening GPSMM failed" << std::endl;
 #endif
   }
-  gps_data_t *gps;
-  gps = gpsmm.read();
+  gps_data_t *gps = nullptr;
+  gps = myGpsmm.read();
   if (gps == nullptr) {
     sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Reading GPS data failed" << std::endl;
   }
@@ -165,6 +160,7 @@ void GPSHyperionHandler::readGpsDataFromGpsd() {
   gpsSet.hours = timeOfDay.hour;
   gpsSet.minutes = timeOfDay.minute;
   gpsSet.seconds = timeOfDay.second;
+  debugHyperionGps = true;
   if (debugHyperionGps) {
     sif::info << "-- Hyperion GPS Data --" << std::endl;
     time_t timeRaw = gps->fix.time.tv_sec;
diff --git a/mission/devices/GPSHyperionHandler.h b/mission/devices/GPSHyperionHandler.h
index 026e1779..c5251794 100644
--- a/mission/devices/GPSHyperionHandler.h
+++ b/mission/devices/GPSHyperionHandler.h
@@ -6,6 +6,11 @@
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 
+#ifdef FSFW_OSAL_LINUX
+#include <gps.h>
+#include <libgpsmm.h>
+#endif
+
 /**
  * @brief   Device handler for the Hyperion HT-GPS200 device
  * @details
@@ -38,6 +43,7 @@ class GPSHyperionHandler : public ExtendedControllerBase {
 
  private:
   GpsPrimaryDataset gpsSet;
+  gpsmm myGpsmm;
   bool debugHyperionGps = false;
 
   void readGpsDataFromGpsd();