diff --git a/radio/src/io/frsky_pxx2.h b/radio/src/io/frsky_pxx2.h
index 70c9e9c60..21d069454 100644
--- a/radio/src/io/frsky_pxx2.h
+++ b/radio/src/io/frsky_pxx2.h
@@ -47,7 +47,7 @@ class ModuleFifo : public Fifo<uint8_t, PXX2_FRAME_MAXLENGTH> {
         return false;
       }
 
-      for (uint32_t i=0; i<=len; i++) {
+      for (uint32_t i = 0; i <= len; i++) {
         frame[i] = fifo[next];
         next = nextIndex(next);
       }
diff --git a/radio/src/targets/common/arm/stm32/sticks_pwm_driver.cpp b/radio/src/targets/common/arm/stm32/sticks_pwm_driver.cpp
index a3c065963..e219f5521 100644
--- a/radio/src/targets/common/arm/stm32/sticks_pwm_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/sticks_pwm_driver.cpp
@@ -20,7 +20,6 @@
 
 #include "opentx.h"
 
-bool sticks_pwm_disabled = false;
 volatile uint32_t pwm_interrupt_count;
 volatile uint16_t timer_capture_values[NUM_PWMSTICKS];
 
diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp
index 1ab46c814..0ac2357a5 100644
--- a/radio/src/targets/horus/board.cpp
+++ b/radio/src/targets/horus/board.cpp
@@ -29,8 +29,6 @@ extern "C" {
 }
 #endif
 
-extern bool sticks_pwm_disabled;
-
 HardwareOptions hardwareOptions;
 
 void watchdogInit(unsigned int duration)
@@ -208,7 +206,7 @@ void boardInit()
   sticksPwmInit();
   delay_ms(20);
   if (pwm_interrupt_count < 32) {
-    sticks_pwm_disabled = true;
+    hardwareOptions.sticksPwmDisabled = true;
   }
 #endif
 
diff --git a/radio/src/telemetry/frsky_pxx2.cpp b/radio/src/telemetry/frsky_pxx2.cpp
index 64c0cef91..6dcdcf7f6 100644
--- a/radio/src/telemetry/frsky_pxx2.cpp
+++ b/radio/src/telemetry/frsky_pxx2.cpp
@@ -223,7 +223,7 @@ void processToolsFrame(uint8_t module, uint8_t * frame)
   }
 }
 
-void processPXX2TelemetryFrame(uint8_t module, uint8_t * frame)
+void processPXX2Frame(uint8_t module, uint8_t *frame)
 {
   switch (frame[1]) {
     case PXX2_TYPE_C_MODULE:
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 39ddd23bf..f17f5579f 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -92,13 +92,13 @@ void telemetryWakeup()
 
   #if defined(INTMODULE_USART)
     while (intmoduleFifo.getFrame(frame)) {
-      processPXX2TelemetryFrame(INTERNAL_MODULE, frame);
+      processPXX2Frame(INTERNAL_MODULE, frame);
     }
   #endif
 
   #if defined(EXTMODULE_USART)
     while (extmoduleFifo.getFrame(frame)) {
-      processPXX2TelemetryFrame(EXTERNAL_MODULE, frame);
+      processPXX2Frame(EXTERNAL_MODULE, frame);
     }
   #endif
 #endif
diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h
index 667d5eb50..e320f303a 100644
--- a/radio/src/telemetry/telemetry.h
+++ b/radio/src/telemetry/telemetry.h
@@ -196,7 +196,7 @@ extern Fifo<uint8_t, LUA_TELEMETRY_INPUT_FIFO_SIZE> * luaInputTelemetryFifo;
 #define IS_TELEMETRY_INTERNAL_MODULE() (false)
 #endif
 
-void processPXX2TelemetryFrame(uint8_t module, uint8_t * frame);
+void processPXX2Frame(uint8_t module, uint8_t *frame);
 void pushPXX2TelemetryPacket(uint8_t module, uint8_t rx_uid, SportTelemetryPacket * packet);
 
 #endif // _TELEMETRY_H_