2 files changed, 4 insertions, 2 deletions

diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 3d9556d924..f9fd6e809b 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -326,9 +326,10 @@ int main(void)
 {
     int button, fd;
     bool on = false;
+#ifdef HAVE_LCD_BITMAP
     const char *msgs[] = { "Battery Benchmark","Check file", BATTERY_LOG,
             "for more info", "PLAY - start", "OFF  - quit" };
-    
+#endif    
     rb->lcd_clear_display();
 
 #ifdef HAVE_LCD_BITMAP
diff --git a/apps/tree.c b/apps/tree.c
index d69217e5b2..ca7b83ef3f 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -639,7 +639,8 @@ static bool dirbrowse(void)
                     /* Stop the music if it is playing */
                     if(audio_status())
                         audio_stop();
-#if (CONFIG_KEYPAD == RECORDER_PAD) && !defined(HAVE_SW_POWEROFF)
+#if defined(HAVE_CHARGING) && \
+    (CONFIG_KEYPAD == RECORDER_PAD) && !defined(HAVE_SW_POWEROFF)
                     else { 
                         if (!charger_inserted()) {
                             if(shutdown_screen())