diff --git a/radio/src/Makefile b/radio/src/Makefile
index 70b357c64..c226a732e 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -573,7 +573,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
   SDCARD = YES
   BUZZER = NO
   THR_TRACE = YES
-  CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM
+  CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DDSM2 -DDSM2_PPM
   ifeq ($(PCB), SKY9X)
     CPPDEFS += -DROTARY_ENCODERS=1
     CPPSRC += targets/sky9x/rotenc_driver.cpp 
@@ -928,7 +928,7 @@ endif
 
 ifeq ($(EXT), $(filter $(EXT), FRSKY TELEMETREZ))
   CPPDEFS += -DFRSKY
-  ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO TARANIS))
+  ifeq ($(PCB), $(filter $(PCB), TARANIS))
 	CPPSRC += telemetry/frsky.cpp telemetry/frsky_sport.cpp telemetry/frsky_d.cpp
     CPPDEFS += -DFRSKY_SPORT
   else
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 375015ebd..cbb5f332c 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -1038,7 +1038,7 @@ void menuModelSetup(uint8_t event)
 #if defined(PCBTARANIS)
     pxxFlag[INTERNAL_MODULE] = 0;
 #endif
-#if defined(CPUARM)
+#if defined(CPUARM) && defined(PXX)
     pxxFlag[EXTERNAL_MODULE] = 0;
 #endif
     return;
@@ -1519,6 +1519,7 @@ void menuModelSetup(uint8_t event)
             lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, l_posHorz==1 ? attr : 0);
             lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, l_posHorz==2 ? attr : 0);
             if (IS_MODULE_XJT(moduleIdx)) {
+#if defined(PXX)
               uint8_t newFlag = 0;
               if (attr && l_posHorz>0 && s_editMode>0) {
                 if (l_posHorz == 1)
@@ -1528,6 +1529,7 @@ void menuModelSetup(uint8_t event)
                 }
               }
               pxxFlag[moduleIdx] = newFlag;
+#endif
             }
 #if defined(DSM2)
             else {
@@ -1712,7 +1714,7 @@ void menuModelSetup(uint8_t event)
     }
   }
 
-#if defined(CPUARM) && defined(FRSKY)
+#if defined(CPUARM) && defined(PXX)
   if (IS_PXX_RANGE_CHECK_ENABLE()) {
     displayPopup("RSSI: ");
     lcd_outdezAtt(16+4*FW, 5*FH, frskyData.rssi[0].value, BOLD);
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 01d8a54b8..cdc977852 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -397,7 +397,7 @@ void applyDefaultTemplate()
 }
 #endif
 
-#if defined(PXX) && defined(CPUARM)
+#if defined(CPUARM)
 void checkModelIdUnique(uint8_t id)
 {
   for (uint8_t i=0; i<MAX_MODELS; i++) {
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 6aa4bd7a9..c42503918 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -987,7 +987,7 @@ void saveTimers();
 void generalDefault();
 void modelDefault(uint8_t id);
 
-#if defined(PXX) && defined(CPUARM)
+#if defined(CPUARM)
 void checkModelIdUnique(uint8_t id);
 #endif
 
diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 12349bba4..e42825aee 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -241,10 +241,12 @@ NOINLINE void processSerialData(uint8_t data)
 #endif
   } // switch
 
+#if defined(FRSKY_SPORT)
   if (IS_FRSKY_SPORT_PROTOCOL() && frskyRxBufferCount >= FRSKY_SPORT_PACKET_SIZE) {
     frskySportProcessPacket(frskyRxBuffer);
     dataState = STATE_DATA_IDLE;
   }
+#endif
 }
 
 void telemetryWakeup()
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 024c5b0b0..c15ac66ff 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -106,7 +106,7 @@ const pm_char STR_OPEN9X[] PROGMEM =
     ISTR(VUNITSSYSTEM)
     ISTR(VBEEPCOUNTDOWN)
 #endif
-#if defined(PXX)
+#if defined(PXX) || defined(CPUARM)
     ISTR(COUNTRYCODES)
     ISTR(VFAILSAFE)
 #endif
@@ -329,7 +329,7 @@ const pm_char STR_MENUGLOBALVARS[] PROGMEM = TR_MENUGLOBALVARS;
 const pm_char STR_RXNUM[] PROGMEM = TR_RXNUM;
 #endif
 
-#if defined(PXX)
+#if defined(PXX) || defined(CPUARM)
 const pm_char STR_SYNCMENU[] PROGMEM = TR_SYNCMENU;
 const pm_char STR_INTERNALRF[] PROGMEM = TR_INTERNALRF;
 const pm_char STR_EXTERNALRF[] PROGMEM = TR_EXTERNALRF;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index ddfed0677..c46dea1d8 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -167,14 +167,11 @@ extern const pm_char STR_OPEN9X[];
 #else
   #define OFS_COUNTRYCODES      (OFS_VLCD)
 #endif
-#if defined(PXX)
+#if defined(PXX) || defined(CPUARM)
   #define OFS_VFAILSAFE         (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
-#else
-  #define OFS_VFAILSAFE         (OFS_COUNTRYCODES)
-#endif
-#if defined(PXX)
   #define OFS_VTRAINERMODES     (OFS_VFAILSAFE + sizeof(TR_VFAILSAFE))
 #else
+  #define OFS_VFAILSAFE         (OFS_COUNTRYCODES)
   #define OFS_VTRAINERMODES     (OFS_VFAILSAFE)
 #endif
 #if defined(CPUARM)
@@ -269,7 +266,7 @@ extern const pm_char STR_OPEN9X[];
   #define STR_VBEEPCOUNTDOWN   (STR_OPEN9X + OFS_VBEEPCOUNTDOWN)
 #endif
 
-#if defined(PXX)
+#if defined(PXX) || defined(CPUARM)
   #define STR_COUNTRYCODES     (STR_OPEN9X + OFS_COUNTRYCODES)
   #define STR_VFAILSAFE        (STR_OPEN9X + OFS_VFAILSAFE)
 #endif
@@ -476,7 +473,7 @@ extern const pm_char STR_FAS_OFFSET[];
 extern const pm_char STR_RXNUM[];
 #endif
 
-#if defined(PXX)
+#if defined(PXX) || defined(CPUARM)
 extern const pm_char STR_SYNCMENU[];
 extern const pm_char STR_INTERNALRF[];
 extern const pm_char STR_EXTERNALRF[];