diff --git a/src/opentx.cpp b/src/opentx.cpp
index dbb102b61..e2498306c 100644
--- a/src/opentx.cpp
+++ b/src/opentx.cpp
@@ -57,12 +57,7 @@ OS_TID btTaskId;
 OS_STK btStack[BT_STACK_SIZE];
 #endif
 
-#if defined(PCBTARANIS) && defined(DEBUG)
-OS_TID debugTaskId;
-OS_STK debugStack[DEBUG_STACK_SIZE];
-#endif
-
-#if defined(PCBSKY9X) && defined(DEBUG)
+#if defined(CPUARM) && defined(DEBUG)
 OS_TID debugTaskId;
 OS_STK debugStack[DEBUG_STACK_SIZE];
 #endif
@@ -4360,11 +4355,7 @@ int main(void)
 
   CoInitOS();
 
-#if defined(PCBSKY9X) && defined(DEBUG)
-  debugTaskId = CoCreateTaskEx(debugTask, NULL, 10, &debugStack[DEBUG_STACK_SIZE-1], DEBUG_STACK_SIZE, 1, false);
-#endif
-
-#if defined(PCBTARANIS) && defined(DEBUG)
+#if defined(CPUARM) && defined(DEBUG)
   debugTaskId = CoCreateTaskEx(debugTask, NULL, 10, &debugStack[DEBUG_STACK_SIZE-1], DEBUG_STACK_SIZE, 1, false);
 #endif
 
diff --git a/src/protocols/pxx_arm.cpp b/src/protocols/pxx_arm.cpp
index b8586458a..9a5e5eb03 100644
--- a/src/protocols/pxx_arm.cpp
+++ b/src/protocols/pxx_arm.cpp
@@ -148,11 +148,12 @@ void setupPulsesPXX(unsigned int port)
   PcmCrc[port] = 0;
   PcmOnesCount[port] = 0;
 
-	/* preamble */
+  /* Preamble */
   putPcmPart(0, port);
   putPcmPart(0, port);
   putPcmPart(0, port);
   putPcmPart(0, port);
+
   /* Sync */
   putPcmHead(port);