diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 5ddb1b36..2ce52aaf 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -104,7 +104,8 @@ void ObjectFactory::produce(){
 			std::string("Heater0"), Gpio::OUT);
 	gpioCookie->addGpio(gpioIds::HEATER_0, gpioConfigForDummyHeater);
 #else
-	GpioConfig_t gpioConfigHeater0(std::string("gpiochip5"), 6,
+	/* Pin H2-11 on stack connector */
+	GpioConfig_t gpioConfigHeater0(std::string("gpiochip5"), 20,
             std::string("Heater0"), Gpio::OUT);
     gpioCookie->addGpio(gpioIds::HEATER_0, gpioConfigHeater0);
 #endif
diff --git a/cmake/scripts/Q7S/win_path_helper_xilinx_tools.sh b/cmake/scripts/Q7S/win_path_helper_xilinx_tools.sh
index ac2411b7..c9bcc54a 100644
--- a/cmake/scripts/Q7S/win_path_helper_xilinx_tools.sh
+++ b/cmake/scripts/Q7S/win_path_helper_xilinx_tools.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 export PATH=$PATH:"/c/Xilinx/SDK/2018.2/gnu/aarch32/nt/gcc-arm-linux-gnueabi/bin"
 export CROSS_COMPILE="arm-linux-gnueabihf"
 
diff --git a/fsfwconfig/OBSWConfig.h b/fsfwconfig/OBSWConfig.h
index ed3ee6f5..954931d8 100644
--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@@ -14,7 +14,7 @@
 
 #define TE0720 0
 
-#define PDU2_DEBUG 1
+#define PDU2_DEBUG 0
 #define PDU1_DEBUG 0
 
 #include "OBSWVersion.h"
diff --git a/mission/devices/HeaterHandler.cpp b/mission/devices/HeaterHandler.cpp
index 6f383ca1..b6cccb2b 100644
--- a/mission/devices/HeaterHandler.cpp
+++ b/mission/devices/HeaterHandler.cpp
@@ -212,7 +212,7 @@ void HeaterHandler::handleSwitchOnCommand(HeaterMapIter heaterMapIter) {
     if (mainSwitchState == PowerSwitchIF::SWITCH_ON) {
         if (!checkSwitchState(switchNr)) {
             gpioId_t gpioId = getGpioIdFromSwitchNr(switchNr);
-//            result = gpioInterface->pullHigh(gpioId);
+            result = gpioInterface->pullHigh(gpioId);
             result = RETURN_OK;
             if (result != RETURN_OK) {
                 sif::error << "HeaterHandler::handleSwitchOffCommand: Failed to pull gpio with id"
@@ -263,7 +263,7 @@ void HeaterHandler::handleSwitchOffCommand(HeaterMapIter heaterMapIter) {
     /* Check whether switch is already off */
     if (checkSwitchState(switchNr)) {
         gpioId_t gpioId = getGpioIdFromSwitchNr(switchNr);
-//        result = gpioInterface->pullLow(gpioId);
+        result = gpioInterface->pullLow(gpioId);
         result = RETURN_OK;
         if (result != RETURN_OK) {
             sif::error << "HeaterHandler::handleSwitchOffCommand: Failed to pull gpio with id"
diff --git a/mission/devices/PCDUHandler.cpp b/mission/devices/PCDUHandler.cpp
index 6e9227d3..9fe9fbdb 100644
--- a/mission/devices/PCDUHandler.cpp
+++ b/mission/devices/PCDUHandler.cpp
@@ -267,7 +267,7 @@ ReturnValue_t PCDUHandler::getFuseState( uint8_t fuseNr ) const  {
 }
 
 uint32_t PCDUHandler::getSwitchDelayMs(void) const {
-    return 15000;
+    return 20000;
 }
 
 object_id_t PCDUHandler::getObjectId() const {