diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c
index 1b501452d0..12676136a2 100644
--- a/apps/menus/theme_menu.c
+++ b/apps/menus/theme_menu.c
@@ -155,7 +155,7 @@ MAKE_MENU(colors_settings, ID2P(LANG_COLORS_MENU),
             &lss_settings,  &set_sep_col,
             &set_bg_col, &set_fg_col, &reset_colors
          );
-         
+
 #endif /* HAVE_LCD_COLOR */
 /*    LCD MENU                    */
 /***********************************/
@@ -211,12 +211,14 @@ MENUITEM_SETTING(remote_statusbar, &global_settings.remote_statusbar,
                                                     statusbar_callback_remote);
 #endif
 MENUITEM_SETTING(volume_type, &global_settings.volume_type, NULL);
+#if (CONFIG_BATTERY_MEASURE != 0)
 MENUITEM_SETTING(battery_display, &global_settings.battery_display, NULL);
+#endif
 MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON,
           &scrollbar_item, &scrollbar_width, &statusbar,
 #ifdef HAVE_REMOTE_LCD
           &remote_statusbar,
-#endif  
+#endif
           &volume_type
 #if (CONFIG_BATTERY_MEASURE != 0)
           , &battery_display
diff --git a/apps/plugins/pitch_detector.c b/apps/plugins/pitch_detector.c
index f7d1219445..9840aab325 100644
--- a/apps/plugins/pitch_detector.c
+++ b/apps/plugins/pitch_detector.c
@@ -143,6 +143,7 @@ typedef int32_t fixed;
 #define LCD_FACTOR (fp_div(int2fixed(LCD_WIDTH), int2fixed(100)))
 /* The threshold for the YIN algorithm */
 #define DEFAULT_YIN_THRESHOLD 5  /* 0.10 */
+#ifndef SIMULATOR
 static const fixed yin_threshold_table[] IDATA_ATTR =
 {
     float2fixed(0.01),
@@ -160,6 +161,7 @@ static const fixed yin_threshold_table[] IDATA_ATTR =
     float2fixed(0.45),
     float2fixed(0.50),
 };
+#endif /* !SIMULATOR */
 
 /* Structure for the reference frequency (frequency of A)
  * It's used for scaling the frequency before finding out
diff --git a/lib/rbcodec/codecs/libayumi/lzh.c b/lib/rbcodec/codecs/libayumi/lzh.c
index 248a2eddec..aeb03e6cee 100644
--- a/lib/rbcodec/codecs/libayumi/lzh.c
+++ b/lib/rbcodec/codecs/libayumi/lzh.c
@@ -209,7 +209,7 @@ int make_table(int nchar, uchar * bitlen, int tablebits, ushort * table)
 }
 
 /* huf.c */
-#if (__GNUC__ == 14) // XXX nuke later?
+#if (__GNUC__ >= 14) // XXX nuke later?
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
 #endif
diff --git a/lib/rbcodec/codecs/libopus/celt/celt_lpc.c b/lib/rbcodec/codecs/libopus/celt/celt_lpc.c
index 9fbef15f83..5bbec1afc6 100644
--- a/lib/rbcodec/codecs/libopus/celt/celt_lpc.c
+++ b/lib/rbcodec/codecs/libopus/celt/celt_lpc.c
@@ -207,7 +207,7 @@ void celt_iir(const opus_val32 *_x,
 #endif
 }
 
-#if (__GNUC__ == 14) // XXX nuke later?
+#if (__GNUC__ >= 14) // XXX nuke later?
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif