diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index 47f6b0146..cb565816e 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -87,9 +87,7 @@ enum {
   CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_ON)
   ITEM_RADIO_SETUP_FLASH_BEEP,
   CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH)
-#if defined(PXX2)
-  ITEM_RADIO_SETUP_OWNER_ID,
-#endif
+  CASE_PXX2(ITEM_RADIO_SETUP_OWNER_ID)
   CASE_GPS(ITEM_RADIO_SETUP_TIMEZONE)
   ITEM_RADIO_SETUP_ADJUST_RTC,
   CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT)
@@ -530,7 +528,7 @@ void menuRadioSetup(event_t event)
         break;
 #endif
 
-#if defined(PXX)
+#if defined(PXX1)
       case ITEM_RADIO_SETUP_COUNTRYCODE:
         g_eeGeneral.countryCode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event);
         break;
diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp
index dfa8f0452..b04c92468 100644
--- a/radio/src/gui/212x64/radio_setup.cpp
+++ b/radio/src/gui/212x64/radio_setup.cpp
@@ -486,7 +486,7 @@ void menuRadioSetup(event_t event)
         break;
 #endif
 
-#if defined(PXX)
+#if defined(PXX1)
       case ITEM_RADIO_SETUP_COUNTRYCODE:
         g_eeGeneral.countryCode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event);
         break;
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 893525326..2ade2cb71 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -607,15 +607,15 @@ bool isExternalModuleAvailable(int moduleType)
 #endif
 
 #if !defined(HARDWARE_EXTERNAL_MODULE_SIZE_STD)
-  if (moduleType == MODULE_TYPE_R9M_PXX1)
+  if (moduleType == MODULE_TYPE_R9M_PXX1 || moduleType == MODULE_TYPE_R9M_PXX2)
     return false;
 #endif
 
-  if (moduleType == MODULE_TYPE_R9M_PXX2 || moduleType == MODULE_TYPE_ISRM_PXX2)
+  if (moduleType == MODULE_TYPE_ISRM_PXX2)
     return false; // doesn't exist for now
 
 #if !defined(PXX2)
-  if (moduleType == MODULE_TYPE_XJT_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2) {
+  if (moduleType == MODULE_TYPE_XJT_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2) {
     return false;
   }
 #endif
diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp
index 629f8001e..acd46b36c 100755
--- a/radio/src/pulses/pulses.cpp
+++ b/radio/src/pulses/pulses.cpp
@@ -73,12 +73,12 @@ uint8_t getRequiredProtocol(uint8_t module)
       break;
 
     case MODULE_TYPE_ISRM_PXX2:
-    case MODULE_TYPE_R9M_LITE_PRO_PXX2:
     case MODULE_TYPE_XJT_LITE_PXX2:
+    case MODULE_TYPE_R9M_PXX2:
+    case MODULE_TYPE_R9M_LITE_PRO_PXX2:
       protocol = PROTOCOL_CHANNELS_PXX2_HIGHSPEED;
       break;
 
-    case MODULE_TYPE_R9M_PXX2:
     case MODULE_TYPE_R9M_LITE_PXX2:
       protocol = PROTOCOL_CHANNELS_PXX2_LOWSPEED;
       break;
@@ -169,7 +169,7 @@ void enablePulsesExternalModule(uint8_t protocol)
       break;
 #endif
 
-#if defined(PXX2) && defined(HARDWARE_EXTERNAL_MODULE_SIZE_SML)
+#if defined(PXX2)
     case PROTOCOL_CHANNELS_PXX2_HIGHSPEED:
       extmoduleInvertedSerialStart(PXX2_HIGHSPEED_BAUDRATE);
       break;