diff --git a/apps/mpeg.c b/apps/mpeg.c
index 2beece1c0c..2a2821bcda 100644
--- a/apps/mpeg.c
+++ b/apps/mpeg.c
@@ -128,6 +128,7 @@ static struct trackdata trackdata[MAX_TRACK_ENTRIES];
 static unsigned int current_track_counter = 0;
 
 #ifndef SIMULATOR
+static void stop_playing(void);
 /* Play time of the previous track */
 static unsigned long prev_track_elapsed;
 
@@ -493,7 +494,6 @@ unsigned long mpeg_get_last_header(void)
 #endif /* !SIMULATOR */
 }
 
-static void stop_playing(void);
 static void do_stop(void)
 {
     is_playing = false;
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 5ab77264f6..e3f2f4fe68 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -3905,9 +3905,7 @@ static bool allocate_tagcache(void)
 static bool tagcache_dumpload(void)
 {
     struct statefile_header shdr;
-    int fd, rc;
-    long offpos;
-    int i, handle;
+    int fd, rc, handle;
     
     fd = open(TAGCACHE_STATEFILE, O_RDONLY);
     if (fd < 0)
@@ -3932,7 +3930,7 @@ static bool tagcache_dumpload(void)
     /* Lets allocate real memory and load it */
     handle = core_alloc_ex("tc ramcache", shdr.tc_stat.ramcache_allocated, &ops);
     ramcache_hdr = core_get_data(handle);
-    moev_lock++;
+    move_lock++;
     rc = read(fd, ramcache_hdr, shdr.tc_stat.ramcache_allocated);
     move_lock--;
     close(fd);
diff --git a/firmware/buflib.c b/firmware/buflib.c
index 880357ccf4..f7ef35ea8b 100644
--- a/firmware/buflib.c
+++ b/firmware/buflib.c
@@ -765,7 +765,7 @@ void buflib_print_block_at(struct buflib_context *ctx, int block_num,
         block_num -= 1;
     }
     snprintf(buf, bufsize, "%8p: val: %4ld (%s)",
-                            this, this->val,
+                            this, (long)this->val,
                             this->val > 0? this[3].name:"<unallocated>");
 }