diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c
index 64cf8a56f1..fa910efee2 100644
--- a/apps/plugins/clock.c
+++ b/apps/plugins/clock.c
@@ -110,6 +110,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 
     struct tm* current_time;
 
+    bool exit = false;
+    bool used = false;
+
     TEST_PLUGIN_API(api);
     (void)parameter;
     rb = api;
@@ -127,9 +130,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 
         /* start all the clock stuff */
 
-        bool exit = false;
-        bool used = false;
-
         /* Time info */
         current_time = rb->get_time();
         hour = current_time->tm_hour;
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index b49c3b35b5..80e871597e 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -1267,6 +1267,7 @@ static const unsigned char empty_id3_header[] =
     0x00, 0x00, 0x1f, 0x76 /* Size is 4096 minus 10 bytes for the header */
 };
 
+#ifdef HAVE_MAS3587F
 static unsigned long get_last_recorded_header(void)
 {
     unsigned long tmp[2];
@@ -1276,6 +1277,7 @@ static unsigned long get_last_recorded_header(void)
     mas_readmem(MAS_BANK_D0, 0xfd1, tmp, 2);
     return 0xffe00000 | ((tmp[0] & 0x7c00) << 6) | (tmp[1] & 0xffff);
 }
+#endif
 
 static void mpeg_thread(void)
 {