diff --git a/firmware/SOURCES b/firmware/SOURCES
index 96d5d3dcec..b85111af44 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -483,7 +483,7 @@ target/hosted/pcm-alsa.c
 drivers/audio/nwzlinux-codec.c
 target/hosted/alsa-controls.c
 target/hosted/pcm-alsa.c
-#elif defined(HAVE_ROCKER_CODEC)
+#elif defined(HAVE_ROCKER_CODEC) && !defined(SIMULATOR)
 drivers/audio/rocker_codec.c
 #elif defined(HAVE_SDL_AUDIO)
 drivers/audio/sdl.c
diff --git a/firmware/target/hosted/sdl/lcd-bitmap.c b/firmware/target/hosted/sdl/lcd-bitmap.c
index 5add2367a0..5f895d802d 100644
--- a/firmware/target/hosted/sdl/lcd-bitmap.c
+++ b/firmware/target/hosted/sdl/lcd-bitmap.c
@@ -112,7 +112,7 @@ static unsigned long get_lcd_pixel(int x, int y)
 #else
     return *FBADDR(x, y);
 #endif
-#elif LCD_DEPTH == 24
+#elif LCD_DEPTH >= 24
     return FB_UNPACK_SCALAR_LCD(*FBADDR(x, y));
 #endif
 }