diff --git a/core_updater_list.c b/core_updater_list.c
index 08af5e02e2..baec5f3989 100644
--- a/core_updater_list.c
+++ b/core_updater_list.c
@@ -330,7 +330,7 @@ bool core_updater_list_get_core(
 static bool core_updater_list_set_date(
       core_updater_list_entry_t *entry, const char *date_str)
 {
-   char *tok, *save;
+   char *tok, *save   = NULL;
    char *elem0        = NULL;
    char *elem1        = NULL;
    char *elem2        = NULL;
@@ -784,7 +784,7 @@ bool core_updater_list_parse_network_data(
       const char *network_buildbot_url,
       const char *data, size_t len)
 {
-   char *tok, *save;
+   char *tok, *save   = NULL;
    unsigned list_size = 0;
    char *data_buf     = NULL;
 
@@ -817,12 +817,12 @@ bool core_updater_list_parse_network_data(
    for (tok = strtok_r(data_buf, "\n", &save); tok;
         tok = strtok_r(NULL, "\n", &save))
    {
-      char *tok2, *save2;
-      char *elem0      = NULL;
-      char *elem1      = NULL;
-      char *elem2      = NULL;
-      char *line_cpy   = NULL;
-      const char *line = tok;
+      char *tok2, *save2 = NULL;
+      char *elem0        = NULL;
+      char *elem1        = NULL;
+      char *elem2        = NULL;
+      char *line_cpy     = NULL;
+      const char *line   = tok;
 
       if (string_is_empty(line))
          continue;
diff --git a/input/connect/connect_retrode.c b/input/connect/connect_retrode.c
index b54191bae1..01aa8e2f3c 100644
--- a/input/connect/connect_retrode.c
+++ b/input/connect/connect_retrode.c
@@ -187,7 +187,7 @@ static void hidpad_retrode_packet_handler(void *device_data, uint8_t *packet, ui
     * 4 = right Genesis/MD
     */
 
-   hidpad_retrode_pad_packet_handler(&device->pad_data[packet[0] - 1], &device->data[0], size);
+   hidpad_retrode_pad_packet_handler(&device->pad_data[packet[0] - 1], &device->data[0], len);
 }
 
 static void hidpad_retrode_set_rumble(void *data,
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index a486e98186..a18fbeb197 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -353,11 +353,11 @@ static int deferred_push_cursor_manager_list_generic(
       menu_displaylist_info_t *info, enum database_query_type type)
 {
    char query[256];
-   char *tok, *save;
-   char *elem0                   = NULL;
-   char *elem1                   = NULL;
-   char *path_cpy                = NULL;
-   const char *path              = info->path;
+   char *tok, *save  = NULL;
+   char *elem0       = NULL;
+   char *elem1       = NULL;
+   char *path_cpy    = NULL;
+   const char *path  = info->path;
 
    if (!path)
       return -1;
@@ -526,8 +526,8 @@ static int general_push(menu_displaylist_info_t *info,
                core_info_get_list(&list);
                if (list && !string_is_empty(list->all_ext))
                {
-                  char *tok, *save;
-                  char *all_ext_cpy    = strdup(list->all_ext);
+                  char *tok, *save  = NULL;
+                  char *all_ext_cpy = strdup(list->all_ext);
 
                   /* If the current core already supports
                    * this extension, skip adding it */
@@ -538,8 +538,8 @@ static int general_push(menu_displaylist_info_t *info,
 
                      if (!string_is_empty(newstr2))
                      {
-                        char *tok2, *save2;
-                        char *newstr2_cpy = strdup(newstr2);
+                        char *tok2, *save2 = NULL;
+                        char *newstr2_cpy  = strdup(newstr2);
                         for ( tok2 = strtok_r(newstr2_cpy, "|", &save2); tok2;
                               tok2 = strtok_r(NULL, "|", &save2))
                         {
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 512140d664..aa97852ba8 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -5376,8 +5376,8 @@ static int action_ok_download_generic(const char *path,
          break;
       case MENU_ENUM_LABEL_CB_CORE_CONTENT_DOWNLOAD:
          {
-            char *tok, *save;
-            char *menu_label_cpy         = strdup(menu_label);
+            char *tok, *save     = NULL;
+            char *menu_label_cpy = strdup(menu_label);
             if ((tok = strtok_r(menu_label_cpy, ";", &save)))
                strlcpy(s, tok, sizeof(s));
             free(menu_label_cpy);
@@ -6243,17 +6243,17 @@ static int action_ok_delete_entry(const char *path,
 static int action_ok_rdb_entry_submenu(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   char *tok, *save;
    char new_str[PATH_MAX_LENGTH];
    char new_label[PATH_MAX_LENGTH];
-   size_t _len                     = 0;
-   char *label_cpy                 = NULL;
+   char *tok, *save = NULL;
+   size_t _len      = 0;
+   char *label_cpy  = NULL;
 
    if (!label)
       return -1;
 
-   new_label[0]                    =  '\0';
-   label_cpy                       = strdup(label);
+   new_label[0]     =  '\0';
+   label_cpy        = strdup(label);
 
    /* element 0: label */
    if ((tok = strtok_r(label_cpy, "|", &save)))
@@ -6939,7 +6939,7 @@ static int generic_action_ok_dropdown_setting(const char *path, const char *labe
       case ST_STRING_OPTIONS:
          if (setting->get_string_representation)
          {
-            char *tok, *save;
+            char *tok, *save         = NULL;
             unsigned tok_idx         = 0;
             char *setting_values_cpy = strdup(setting->values);
 
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index c8a22062b7..75ce5d941a 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -812,8 +812,8 @@ static int action_get_title_generic(char *s, size_t len,
 {
    if (!string_is_empty(path))
    {
-      char *tok, *save;
-      char *path_cpy = strdup(path);
+      char *tok, *save = NULL;
+      char *path_cpy   = strdup(path);
 
       if ((tok = strtok_r(path_cpy, "|", &save)))
       {
diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
index 4afe3a1605..c14868f0cf 100644
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@@ -6751,7 +6751,7 @@ static void ozone_draw_osk(
       0.00, 0.00, 0.00, 0.15,
       0.00, 0.00, 0.00, 0.15,
    };
-   char *tok, *save;
+   char *tok, *save               = NULL;
    unsigned i                     = 0;
    static retro_time_t last_time  = 0;
    unsigned list_size             = 0;
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 2ca60b46d5..4174676d1d 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -7166,7 +7166,7 @@ static void rgui_update_menu_sublabel(rgui_t *rgui, size_t selection)
 
    if (!string_is_empty(entry.sublabel))
    {
-      char *tok, *save;
+      char *tok, *save         = NULL;
       static const char* const
          sublabel_spacer       = RGUI_TICKER_SPACER;
       bool prev_line_empty     = true;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index a444676286..232ced8a7f 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -13073,7 +13073,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 #endif
                if (!string_is_empty(info->label))
                {
-                  char *tok, *save;
+                  char *tok, *save     = NULL;
                   char *info_label_cpy = strdup(info->label);
 
                   if ((tok = strtok_r(info_label_cpy, "|", &save)))
@@ -15594,7 +15594,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                         case ST_STRING_OPTIONS:
                            {
                               char val_d[16];
-                              char *tok, *save;
+                              char *tok, *save         = NULL;
                               unsigned i               = 0;
                               bool checked_found       = false;
                               unsigned checked         = 0;
@@ -15943,7 +15943,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                      case ST_STRING_OPTIONS:
                         {
                            char val_d[16];
-                           char *tok, *save;
+                           char *tok, *save         = NULL;
                            unsigned i               = 0;
                            bool checked_found       = false;
                            unsigned checked         = 0;
diff --git a/playlist.c b/playlist.c
index 7b029219ae..8242d954bd 100644
--- a/playlist.c
+++ b/playlist.c
@@ -2823,7 +2823,7 @@ static bool playlist_read_file(playlist_t *playlist)
                      line_buf[3], thumbnail_mode_str,
                      sizeof(thumbnail_mode_str)) > 0)
                {
-                  char *tok, *save;
+                  char *tok, *save             = NULL;
                   char *thumbnail_mode_str_cpy = strdup(thumbnail_mode_str);
 
                   if ((tok = strtok_r(thumbnail_mode_str_cpy, "|", &save)))
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 1d4512c627..10de01f9a1 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -222,7 +222,7 @@ bool content_file_override_set(
 
    for (i = 0; overrides[i].extensions; i++)
    {
-      char *tok, *save;
+      char *tok, *save        = NULL;
       char *overrides_ext_cpy = strdup(overrides[i].extensions);
 
       /* Get list of extensions affected by overrides */
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 321b9aea5b..afd15e0584 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -102,8 +102,8 @@ static void task_overlay_load_desc_image(
 static void task_overlay_redefine_eightway_direction(
       char *str, input_bits_t *data)
 {
-   char *tok, *save;
    unsigned bit;
+   char *tok, *save = NULL;
 
    BIT256_CLEAR_ALL(*data);
 
@@ -230,7 +230,7 @@ static bool task_overlay_load_desc(
    char overlay_desc_key[32];
    char overlay_key[64];
    char overlay[256];
-   char *tok, *save;
+   char *tok, *save                     = NULL;
    unsigned list_size                   = 0;
    char *elem0                          = NULL;
    char *elem1                          = NULL;
@@ -835,7 +835,7 @@ static void task_overlay_deferred_load(retro_task_t *task)
       if (config_get_array(conf, overlay->config.rect.key,
                overlay->config.rect.array, sizeof(overlay->config.rect.array)))
       {
-         char *tok, *save;
+         char *tok, *save         = NULL;
          char *elem0              = NULL;
          char *elem1              = NULL;
          char *elem2              = NULL;