diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index cde04624d7..a4fc93549c 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -453,6 +453,7 @@ static void cliPrintError(const char *cmdName, const char *format, ...)
     va_list va;
     va_start(va, format);
     cliPrintErrorVa(cmdName, format, va);
+    va_end(va);
 
     if (!cliWriter) {
         // Supply our own linefeed in case we are printing inside a custom defaults operation
@@ -467,6 +468,7 @@ static void cliPrintErrorLinef(const char *cmdName, const char *format, ...)
     va_list va;
     va_start(va, format);
     cliPrintErrorVa(cmdName, format, va);
+    va_end(va);
     cliPrintInternal(cliErrorWriter, "\r\n");
 }
 
diff --git a/src/main/drivers/light_ws2811strip.c b/src/main/drivers/light_ws2811strip.c
index 12ea26e7e7..bd01af20a1 100644
--- a/src/main/drivers/light_ws2811strip.c
+++ b/src/main/drivers/light_ws2811strip.c
@@ -181,8 +181,8 @@ STATIC_UNIT_TESTED void updateLEDDMABuffer(ledStripFormatRGB_e ledFormat, rgbCol
     }
 
     unsigned dmaBufferOffset = 0;
-    for (int index = bits_per_led-1; index >= 0; index--) {
-        ledStripDMABuffer[ledIndex * bits_per_led + dmaBufferOffset++] = (packed_colour & (1 << index)) ? BIT_COMPARE_1 : BIT_COMPARE_0;
+    for (int index = bits_per_led - 1; index >= 0; index--) {
+        ledStripDMABuffer[ledIndex * bits_per_led + dmaBufferOffset++] = (packed_colour & (1U << index)) ? BIT_COMPARE_1 : BIT_COMPARE_0;
     }
 }
 
diff --git a/src/main/drivers/stm32/adc_stm32h7xx.c b/src/main/drivers/stm32/adc_stm32h7xx.c
index b9dac05777..d4ade965d9 100644
--- a/src/main/drivers/stm32/adc_stm32h7xx.c
+++ b/src/main/drivers/stm32/adc_stm32h7xx.c
@@ -113,7 +113,7 @@ const adcTagMap_t adcTagMap[] = {
     { DEFIO_TAG_E__NONE, ADC_DEVICE_FOR_INTERNAL,   ADC_CHANNEL_VREFINT,    19 }, // 19 VREFINT
     { DEFIO_TAG_E__NONE, ADC_DEVICE_FOR_INTERNAL,   ADC_CHANNEL_TEMPSENSOR, 18 }, // 18 VSENSE
     { DEFIO_TAG_E__NONE, ADC_DEVICE_FOR_INTERNAL,   ADC_CHANNEL_VBAT,       17 }, // 17 VBAT/4
-#elif
+#else
 #error MCU not defined
 #endif
 
diff --git a/src/main/io/beeper.h b/src/main/io/beeper.h
index 38e6c8a8c4..259fe94699 100644
--- a/src/main/io/beeper.h
+++ b/src/main/io/beeper.h
@@ -22,7 +22,7 @@
 
 #include "common/time.h"
 
-#define BEEPER_GET_FLAG(mode) (1 << (mode - 1))
+#define BEEPER_GET_FLAG(mode) (1 << ((mode) - 1))
 
 #ifdef USE_DSHOT
 #define DSHOT_BEACON_GUARD_DELAY_US 1200000  // Time to separate dshot beacon and armining/disarming events
diff --git a/src/main/io/serial_4way.c b/src/main/io/serial_4way.c
index 9b97969aa2..bacbd9a532 100644
--- a/src/main/io/serial_4way.c
+++ b/src/main/io/serial_4way.c
@@ -579,12 +579,13 @@ void esc4wayProcess(serialPort_t *mspPort)
                 case cmd_InterfaceSetMode:
                 {
 #if defined(USE_SERIAL_4WAY_BLHELI_BOOTLOADER) && defined(USE_SERIAL_4WAY_SK_BOOTLOADER)
-                    if ((ParamBuf[0] <= imARM_BLB) && (ParamBuf[0] >= imSIL_BLB)) {
+                    if ((ParamBuf[0] <= imARM_BLB) && (ParamBuf[0] >= imSIL_BLB))
 #elif defined(USE_SERIAL_4WAY_BLHELI_BOOTLOADER)
-                    if (((ParamBuf[0] <= imATM_BLB)||(ParamBuf[0] == imARM_BLB)) && (ParamBuf[0] >= imSIL_BLB)) {
+                    if (((ParamBuf[0] <= imATM_BLB)||(ParamBuf[0] == imARM_BLB)) && (ParamBuf[0] >= imSIL_BLB))
 #elif defined(USE_SERIAL_4WAY_SK_BOOTLOADER)
-                    if (ParamBuf[0] == imSK) {
+                    if (ParamBuf[0] == imSK)
 #endif
+                    {
                         CurrentInterfaceMode = ParamBuf[0];
                     } else {
                         ACK_OUT = ACK_I_INVALID_PARAM;
diff --git a/src/main/io/spektrum_rssi.c b/src/main/io/spektrum_rssi.c
index eb510fd35f..a9d65caef7 100644
--- a/src/main/io/spektrum_rssi.c
+++ b/src/main/io/spektrum_rssi.c
@@ -153,7 +153,7 @@ void spektrumHandleRSSI(volatile uint8_t spekFrame[])
                                                        0,resolution));
 #else
             // Do a direkt dBm to percent mapping, keeping the non-linear dBm logarithmic curve.
-            spekChannelData[rssi_channel] = (uint16_t)(map(rssi),
+            spekChannelData[rssi_channel] = (uint16_t)(map(rssi,
                                                        SPEKTRUM_RSSI_MIN, SPEKTRUM_RSSI_MAX,
                                                        0,resolution));
 #endif
diff --git a/src/main/rx/srxl2.c b/src/main/rx/srxl2.c
index 8caf68e1fd..4dbde31476 100644
--- a/src/main/rx/srxl2.c
+++ b/src/main/rx/srxl2.c
@@ -226,7 +226,7 @@ bool srxl2ProcessControlData(const Srxl2Header* header, rxRuntimeState_t *rxRunt
         DEBUG_PRINTF("vtx region: %x\r\n", vtxData->region);
         // Pack data as it was used before srxl2 to use existing functions.
         // Get the VTX control bytes in a frame
-        uint32_t vtxControl =   (0xE0 << 24) | (0xE0 << 8) |
+        uint32_t vtxControl =   (0xE0U << 24) | (0xE0 << 8) |
                                 ((vtxData->band & 0x07) << 21) |
                                 ((vtxData->channel & 0x0F) << 16) |
                                 ((vtxData->pit & 0x01) << 4) |