diff --git a/linux/obc/PdecHandler.cpp b/linux/obc/PdecHandler.cpp
index 86493ce8..9f95860b 100644
--- a/linux/obc/PdecHandler.cpp
+++ b/linux/obc/PdecHandler.cpp
@@ -435,9 +435,9 @@ uint8_t PdecHandler::getOddParity(uint8_t number) {
 }
 
 void PdecHandler::getClcw() {
-    uint32_t clcw = *(registerBaseAddress + PDEC_CLCW_OFFSET);
 
 #if OBSW_DEBUG_PDEC_HANDLER == 1
+    uint32_t clcw = *(registerBaseAddress + PDEC_CLCW_OFFSET);
     if (debugDivider == 5) {
         printClcw(clcw);
         debugDivider = 0;
diff --git a/linux/obc/PdecHandler.h b/linux/obc/PdecHandler.h
index 4e07ea43..d6b44c13 100644
--- a/linux/obc/PdecHandler.h
+++ b/linux/obc/PdecHandler.h
@@ -1,6 +1,7 @@
 #ifndef LINUX_OBC_PDECHANDLER_H_
 #define LINUX_OBC_PDECHANDLER_H_
 
+#include "OBSWConfig.h"
 #include "PdecConfig.h"
 #include "fsfw/returnvalues/HasReturnvaluesIF.h"
 #include "fsfw_hal/common/gpio/gpioDefinitions.h"
@@ -106,9 +107,15 @@ private:
     static const uint32_t PDEC_BPTR_OFFSET = 0xA25;
     static const uint32_t PDEC_SLEN_OFFSET = 0xA26;
 
+#if BOARD_TE0720 == 1
     static const int CONFIG_MEMORY_MAP_SIZE = 0x400;
     static const int RAM_MAP_SIZE = 0x4000;
     static const int REGISTER_MAP_SIZE = 0x10000;
+#else
+    static const int CONFIG_MEMORY_MAP_SIZE = 0x400;
+    static const int RAM_MAP_SIZE = 0x4000;
+    static const int REGISTER_MAP_SIZE = 0x4000;
+#endif /* BOARD_TE0720 == 1 */
 
     // 0x200 / 4 = 0x80
     static const uint32_t FRAME_HEADER_OFFSET = 0x80;
diff --git a/linux/obc/PtmeConfig.h b/linux/obc/PtmeConfig.h
index a3b17551..9ec9cfde 100644
--- a/linux/obc/PtmeConfig.h
+++ b/linux/obc/PtmeConfig.h
@@ -20,9 +20,9 @@ namespace PtmeConfig {
     static const uint32_t VC2_OFFSETT = 0x8000;
     static const uint32_t VC3_OFFSETT = 0xC000;
 #if BOARD_TE0720 == 0
-    static const char UIO_DEVICE_FILE[] = "/dev/uio0";
-#else
     static const char UIO_DEVICE_FILE[] = "/dev/uio1";
+#else
+    static const char UIO_DEVICE_FILE[] = "/dev/uio0";
 #endif
 
 };