diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 66825d65a1..679cbde96b 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -735,8 +735,6 @@ static void materialui_render(void *data,
    {
       size_t ii;
       int16_t pointer_y   = pointer.y;
-      float old_accel_val = 0.0f;
-      float new_accel_val = 0.0f;
       size_t entries_end  = menu_entries_get_size();
 
       for (ii = 0; ii < entries_end; ii++)
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 5ab7814f2a..4f2713b8ee 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -3323,13 +3323,11 @@ static void xmb_render(void *data,
       unsigned width, unsigned height, bool is_idle)
 {
    size_t i;
+   float scale_factor;
+   menu_input_pointer_t pointer;
    settings_t   *settings   = config_get_ptr();
    xmb_handle_t *xmb        = (xmb_handle_t*)data;
    unsigned      end        = (unsigned)menu_entries_get_size();
-   bool mouse_enable        = settings->bools.menu_mouse_enable;
-   bool pointer_enable      = settings->bools.menu_pointer_enable;
-   float scale_factor;
-   menu_input_pointer_t pointer;
 
    if (!xmb)
       return;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index c2a4dd9c35..7ac5f14c4b 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -8719,11 +8719,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
             union string_list_elem_attr attr;
             struct string_list *str_list     = string_list_new();
 
-            (void)attr;
-
             attr.i = 0;
             new_exts[0] = '\0';
 
+            (void)attr;
+
 #ifdef HAVE_RBMP
             string_list_append(str_list, "bmp", attr);
 #endif
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 83c0bdf183..1b71a34d6b 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -1026,9 +1026,9 @@ static int task_database_iterate_playlist_archive(
 #ifdef HAVE_COMPRESSION
    return task_database_iterate_crc_lookup(
          _db, db_state, db, name, db_state->archive_name);
-#endif
-
+#else
    return 1;
+#endif
 }
 
 static int task_database_iterate_playlist_lutro(
diff --git a/tasks/task_pl_thumbnail_download.c b/tasks/task_pl_thumbnail_download.c
index e4f1e5f196..2d4af10833 100644
--- a/tasks/task_pl_thumbnail_download.c
+++ b/tasks/task_pl_thumbnail_download.c
@@ -351,7 +351,6 @@ static void task_pl_thumbnail_download_handler(retro_task_t *task)
       default:
          task_set_progress(task, 100);
          goto task_finished;
-         break;
    }
    
    return;
@@ -633,7 +632,6 @@ static void task_pl_entry_thumbnail_download_handler(retro_task_t *task)
       default:
          task_set_progress(task, 100);
          goto task_finished;
-         break;
    }
    
    return;
diff --git a/tasks/task_playlist_manager.c b/tasks/task_playlist_manager.c
index 6467040826..258fbb3adb 100644
--- a/tasks/task_playlist_manager.c
+++ b/tasks/task_playlist_manager.c
@@ -206,15 +206,11 @@ static void task_pl_manager_reset_cores_handler(retro_task_t *task)
             strlcat(task_title, pl_manager->playlist_name, sizeof(task_title));
             
             task_set_title(task, strdup(task_title));
-            task_set_progress(task, 100);
-            
-            goto task_finished;
          }
-         break;
+         /* fall-through */
       default:
          task_set_progress(task, 100);
          goto task_finished;
-         break;
    }
    
    return;