diff --git a/apps/tagcache.c b/apps/tagcache.c
index 9719e4e651..248e57237d 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -443,7 +443,7 @@ static int open_master_fd(struct master_header *hdr, bool write)
 
     /* Check the header. */
     rc = read(fd, hdr, sizeof(struct master_header));
-    if (hdr->tch.magic == TAGCACHE_MAGIC && rc == sizeof(struct master_header))
+    if (rc == sizeof(struct master_header) && hdr->tch.magic == TAGCACHE_MAGIC)
     {
         /* Success. */
         return fd;
@@ -453,7 +453,7 @@ static int open_master_fd(struct master_header *hdr, bool write)
     lseek(fd, 0, SEEK_SET);
 
     rc = ecread(fd, hdr, 1, master_header_ec, true);
-    if (hdr->tch.magic != TAGCACHE_MAGIC || rc != sizeof(struct master_header))
+    if (rc != sizeof(struct master_header) || hdr->tch.magic != TAGCACHE_MAGIC)
     {
         logf("header error");
         tc_stat.ready = false;
@@ -3935,13 +3935,13 @@ static void fix_ramcache(void* old_addr, void* new_addr)
 
 static int move_cb(int handle, void* current, void* new)
 {
+    (void)handle;
     if (tcramcache.move_lock > 0)
         return BUFLIB_CB_CANNOT_MOVE;
 
     fix_ramcache(current, new);
     tcramcache.hdr = new;
     return BUFLIB_CB_OK;
-    (void)handle;
 }
 
 static struct buflib_callbacks ops = {
diff --git a/apps/tagcache.h b/apps/tagcache.h
index b64571de40..52a9283e35 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -38,9 +38,11 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title,
     /* Real tags end here, count them. */
     TAG_COUNT,
     /* Virtual tags */
-    tag_virt_basename, tag_virt_length_min, tag_virt_length_sec,
+    tag_virt_basename=TAG_COUNT,
+    tag_virt_length_min, tag_virt_length_sec,
     tag_virt_playtime_min, tag_virt_playtime_sec,
-    tag_virt_entryage, tag_virt_autoscore };
+    tag_virt_entryage, tag_virt_autoscore,
+    TAG_COUNT_ALL};
 
 /* Maximum length of a single tag. */
 #define TAG_MAXLEN (MAX_PATH*2)