diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index c44be3ad1b..50b8d2fe71 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2471,7 +2471,7 @@ static bool dbg_talk(void)
 
     simplelist_reset_lines();
 
-    simplelist_setline("Current voice file:"); 
+    simplelist_setline("Current voice file:");
     if (data.status != TALK_STATUS_ERR_NOFILE)
         simplelist_addline(" %s", data.voicefile);
     else
@@ -2631,7 +2631,7 @@ static bool dbg_device_data(void)
     simplelist_setline("Device data RAW:");
     for (size_t i = 0; i < device_data.length; i += 4)
     {
-        simplelist_addline("%02x: %02x %02x %02x %02x", i,
+        simplelist_addline("%02zx: %02x %02x %02x %02x", i,
                            device_data.payload[i + 0], device_data.payload[i + 1],
                            device_data.payload[i + 2], device_data.payload[i + 3]);
     }
diff --git a/firmware/export/config/erosqnative.h b/firmware/export/config/erosqnative.h
index 344f3ab726..648c5859ab 100644
--- a/firmware/export/config/erosqnative.h
+++ b/firmware/export/config/erosqnative.h
@@ -77,8 +77,10 @@
 #define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP)
 #define AUDIOHW_HAVE_SHORT_ROLL_OFF
 
+#ifndef SIMULATOR
 /* use high-bitdepth volume scaling */
 #define PCM_NATIVE_BITDEPTH 24
+#endif
 
 /* Button defines */
 #define CONFIG_KEYPAD   EROSQ_PAD