diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index 1af89d456..f31500fa8 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -1776,6 +1776,7 @@ static void printMotorMix(dumpFlags_t dumpMask, const motorMixer_t *customMotorM
 static void cliMotorMix(const char *cmdName, char *cmdline)
 {
 #ifdef USE_QUAD_MIXER_ONLY
+    UNUSED(cmdName);
     UNUSED(cmdline);
 #else
     int check = 0;
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index ffa020258..1282e7664 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -58,6 +58,16 @@
 #endif
 #endif
 
+#if !defined(USE_MAG)
+#undef USE_MAG_DATA_READY_SIGNAL
+#undef USE_MAG_HMC5883
+#undef USE_MAG_SPI_HMC5883
+#undef USE_MAG_QMC5883
+#undef USE_MAG_LIS3MDL
+#undef USE_MAG_AK8963
+#undef USE_MAG_SPI_AK8963
+#endif
+
 #if !defined(USE_BARO) && !defined(USE_GPS)
 #undef USE_VARIO
 #endif
@@ -192,6 +202,11 @@
 #undef USE_USB_MSC
 #endif
 
+#if !defined(USE_SDCARD)
+#undef USE_SDCARD_SDIO
+#undef USE_SDCARD_SPI
+#endif
+
 #if !defined(USE_VCP)
 #undef USE_USB_CDC_HID
 #undef USE_USB_MSC