diff --git a/mission/acs/ImtqHandler.cpp b/mission/acs/ImtqHandler.cpp
index f1f1bcf6..f3d04a36 100644
--- a/mission/acs/ImtqHandler.cpp
+++ b/mission/acs/ImtqHandler.cpp
@@ -196,7 +196,7 @@ ReturnValue_t ImtqHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
 }
 
 ReturnValue_t ImtqHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
-  if (internalState == InternalState::STARTUP) {
+  if (internalState == InternalState::STARTUP or internalState == InternalState::SHUTDOWN) {
     *id = imtq::cmdIds::REQUEST;
     return buildCommandFromCommand(*id, nullptr, 0);
   }
diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp
index fcbdcc6e..40732968 100644
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@@ -129,7 +129,7 @@ void ThermalController::performControlOperation() {
     hpaLimits.opUpperLimit = 0;
     hpaLimits.nopUpperLimit = 0;
 #endif
-    if(changedLimits) {
+    if (changedLimits) {
       sif::debug << "ThermalController: changing limits" << std::endl;  // TODO: rausschmeissen
     }
   }