diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h
index 1cf0874e4..6a7ea6c49 100644
--- a/radio/src/datastructs_private.h
+++ b/radio/src/datastructs_private.h
@@ -65,7 +65,7 @@
 PACK(union SourceNumVal {
   struct {
     int16_t value:10;
-    int16_t isSource:1;
+    uint16_t isSource:1;
   };
   uint16_t rawValue:11;
 });
diff --git a/radio/src/definitions.h b/radio/src/definitions.h
index 9165dfcc0..f19dc6712 100644
--- a/radio/src/definitions.h
+++ b/radio/src/definitions.h
@@ -42,7 +42,7 @@
 #endif
 
 #if !defined(UNUSED)
-  #define UNUSED(x)           ((void)(x)) /* to avoid warnings */
+  #define UNUSED(X) (void)X      /* To avoid gcc/g++ warnings */
 #endif
 
 #if !defined(__ALIGNED)
diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp
index 8e04fc372..3126a8950 100644
--- a/radio/src/functions.cpp
+++ b/radio/src/functions.cpp
@@ -157,7 +157,9 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
   }
 #endif
 
+#if defined(VIDEO_SWITCH)
   bool videoEnabled = false;
+#endif
   for (uint8_t i=0; i<MAX_SPECIAL_FUNCTIONS; i++) {
     const CustomFunctionData * cfn = &functions[i];
     swsrc_t swtch = CFN_SWITCH(cfn);
diff --git a/radio/src/gui/colorlcd/mainview/topbar_impl.cpp b/radio/src/gui/colorlcd/mainview/topbar_impl.cpp
index 74208a186..685db3704 100644
--- a/radio/src/gui/colorlcd/mainview/topbar_impl.cpp
+++ b/radio/src/gui/colorlcd/mainview/topbar_impl.cpp
@@ -61,7 +61,7 @@ rect_t TopBar::getZone(unsigned int index) const
 {
   coord_t x = MENU_HEADER_BUTTONS_LEFT + 1;
 
-  for (int i = 0; i < index; i += 1)
+  for (unsigned int i = 0; i < index; i += 1)
     x += (g_model.topbarWidgetWidth[i] * (TOPBAR_ZONE_WIDTH + PAD_TINY));
 
   coord_t size = ((g_model.topbarWidgetWidth[index] - 1) * (TOPBAR_ZONE_WIDTH + PAD_TINY) + TOPBAR_ZONE_WIDTH);
diff --git a/radio/src/gui/colorlcd/model/curveedit.cpp b/radio/src/gui/colorlcd/model/curveedit.cpp
index 5605a8d0b..57e8c1bae 100644
--- a/radio/src/gui/colorlcd/model/curveedit.cpp
+++ b/radio/src/gui/colorlcd/model/curveedit.cpp
@@ -166,8 +166,7 @@ class CurveDataEdit : public Window
 
     // y value
     for (uint8_t i = 0; i < count; i++) {
-      auto numedit = new NumberEdit(
-          parent,
+      new NumberEdit(parent,
           {PTNUM_X + (i * (NUM_BTN_WIDTH + PAD_TINY)), y, NUM_BTN_WIDTH,
            EdgeTxStyles::UI_ELEMENT_HEIGHT},
           -100, 100, GET_VALUE(points[i + start]),
diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp
index a9636459c..4e045af71 100644
--- a/radio/src/gui/navigation/navigation_x7.cpp
+++ b/radio/src/gui/navigation/navigation_x7.cpp
@@ -51,12 +51,9 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, int srcMin, int sr
 #endif
 
   bool isSource = false;
-  bool origIsSource = false;
   if (i_flags & INCDEC_SOURCE_VALUE) {
     SourceNumVal v;
     v.rawValue = val;
-    // Save isSource flag;
-    origIsSource = isSource = v.isSource;
     // Remove isSource flag;
     val = v.value;
     newval = v.value;
diff --git a/radio/src/targets/common/arm/stm32/usb_driver.cpp b/radio/src/targets/common/arm/stm32/usb_driver.cpp
index afe881c1b..3a2dc9c00 100644
--- a/radio/src/targets/common/arm/stm32/usb_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/usb_driver.cpp
@@ -23,6 +23,8 @@
 #include "usb_joystick.h"
 #else
 #include "edgetx_helpers.h"
+#include "dataconstants.h"
+#include "globals.h"
 #endif
 
 extern "C" {
@@ -203,16 +205,9 @@ void usbJoystickRestart()
   USBD_RegisterClass(&hUsbDevice, &USBD_HID);
   USBD_Start(&hUsbDevice);
 }
-#else
-// TODO: fix after HAL conversion is complete
-#warning channelOutputs should come from "globals.h"
-
-#define MAX_OUTPUT_CHANNELS 32
-extern int16_t channelOutputs[MAX_OUTPUT_CHANNELS];
 #endif
 
 
-
 /*
   Prepare and send new USB data packet
 
diff --git a/radio/src/targets/taranis/led_driver.cpp b/radio/src/targets/taranis/led_driver.cpp
index d39da4c93..3a5ad9e27 100644
--- a/radio/src/targets/taranis/led_driver.cpp
+++ b/radio/src/targets/taranis/led_driver.cpp
@@ -45,7 +45,7 @@ void ledInit()
 #endif
 
 #if defined(FUNCTION_SWITCHES)
-  for (int i = 0; i < DIM(fsLeds); i++) {
+  for (size_t i = 0; i < DIM(fsLeds); i++) {
     gpio_init(fsLeds[i], GPIO_OUT, GPIO_PIN_SPEED_LOW);
   }
 #endif