diff --git a/src/main/flight/imu.c b/src/main/flight/imu.c
index 9fc7c08e29..40f0a24d7a 100644
--- a/src/main/flight/imu.c
+++ b/src/main/flight/imu.c
@@ -82,8 +82,7 @@ PG_RESET_TEMPLATE(imuConfig_t, imuConfig,
     .dcm_kp = 2500,                // 1.0 * 10000
     .dcm_ki = 0,                   // 0.003 * 10000
     .small_angle = 25,
-    .accDeadband.xy = 40,
-    .accDeadband.z = 40,
+    .accDeadband = {.xy = 40, .z= 40},
     .acc_unarmedcal = 1
 );
 
diff --git a/src/main/io/vtx_smartaudio.c b/src/main/io/vtx_smartaudio.c
index c5e6467a21..7e93bdedc4 100644
--- a/src/main/io/vtx_smartaudio.c
+++ b/src/main/io/vtx_smartaudio.c
@@ -804,7 +804,7 @@ void vtxSASetPitmode(uint8_t onoff)
 
     saSetMode(newmode);
 
-    return true;
+    return;
 }
 
 bool vtxSAGetBandChan(uint8_t *pBand, uint8_t *pChan)
@@ -1137,9 +1137,9 @@ static CMS_Menu saCmsMenuStats = {
     .entries = saCmsMenuStatsEntries
 };
 
-static OSD_TAB_t saCmsEntBand = { &saCmsBand, 5, vtx58BandNames, NULL };
+static OSD_TAB_t saCmsEntBand = { &saCmsBand, 5, vtx58BandNames };
 
-static OSD_TAB_t saCmsEntChan = { &saCmsChan, 8, vtx58ChannelNames, NULL };
+static OSD_TAB_t saCmsEntChan = { &saCmsChan, 8, vtx58ChannelNames };
 
 static const char * const saCmsPowerNames[] = {
     "---",
diff --git a/src/main/io/vtx_tramp.c b/src/main/io/vtx_tramp.c
index 7409154bae..f7b946b287 100644
--- a/src/main/io/vtx_tramp.c
+++ b/src/main/io/vtx_tramp.c
@@ -464,15 +464,15 @@ uint8_t trampCmsBand = 1;
 uint8_t trampCmsChan = 1;
 uint16_t trampCmsFreqRef;
 
-static OSD_TAB_t trampCmsEntBand = { &trampCmsBand, 5, vtx58BandNames, NULL };
+static OSD_TAB_t trampCmsEntBand = { &trampCmsBand, 5, vtx58BandNames };
 
-static OSD_TAB_t trampCmsEntChan = { &trampCmsChan, 8, vtx58ChannelNames, NULL };
+static OSD_TAB_t trampCmsEntChan = { &trampCmsChan, 8, vtx58ChannelNames };
 
 static OSD_UINT16_t trampCmsEntFreqRef = { &trampCmsFreqRef, 5600, 5900, 0 };
 
 static uint8_t trampCmsPower = 1;
 
-static OSD_TAB_t trampCmsEntPower = { &trampCmsPower, 5, trampPowerNames, NULL };
+static OSD_TAB_t trampCmsEntPower = { &trampCmsPower, 5, trampPowerNames };
 
 static void trampCmsUpdateFreqRef(void)
 {
@@ -526,7 +526,7 @@ static const char * const trampCmsPitmodeNames[] = {
     "---", "OFF", "ON "
 };
 
-static OSD_TAB_t trampCmsEntPitmode = { &trampCmsPitmode, 2, trampCmsPitmodeNames, NULL };
+static OSD_TAB_t trampCmsEntPitmode = { &trampCmsPitmode, 2, trampCmsPitmodeNames };
 
 static long trampCmsSetPitmode(displayPort_t *pDisp, const void *self)
 {