diff --git a/menu/cbs/menu_cbs_info.c b/menu/cbs/menu_cbs_info.c
index 6bf2b07059..186d000343 100644
--- a/menu/cbs/menu_cbs_info.c
+++ b/menu/cbs/menu_cbs_info.c
@@ -29,7 +29,9 @@ static int action_info_default(unsigned type, const char *label)
 
    info.list          = menu_list->menu_stack;
    info.directory_ptr = nav->selection_ptr;
-   strlcpy(info.label, "info_screen", sizeof(info.label));
+   strlcpy(info.label,
+         menu_hash_to_str(MENU_LABEL_INFO_SCREEN),
+        sizeof(info.label));
 
    return menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
 }
diff --git a/menu/cbs/menu_cbs_iterate.c b/menu/cbs/menu_cbs_iterate.c
index 155f9c2a60..09ce8d2f08 100644
--- a/menu/cbs/menu_cbs_iterate.c
+++ b/menu/cbs/menu_cbs_iterate.c
@@ -117,7 +117,8 @@ static int archive_load(void)
          info.type          = 0;
          info.directory_ptr = selected;
          strlcpy(info.path, settings->libretro_directory, sizeof(info.path));
-         strlcpy(info.label, "deferred_core_list", sizeof(info.label));
+         strlcpy(info.label,
+               menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST), sizeof(info.label));
 
          ret = menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
          break;
@@ -426,10 +427,15 @@ static int action_iterate_menu_viewport(char *s, size_t len, const char *label,
    }
    else
    {
-      if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
-         base_msg = "Set Upper-Left Corner";
-      else if (hash == MENU_LABEL_CUSTOM_VIEWPORT_2)
-         base_msg = "Set Bottom-Right Corner";
+      switch (type)
+      {
+         case MENU_SETTINGS_CUSTOM_VIEWPORT:
+            base_msg = "Set Upper-Left Corner";
+            break;
+         case MENU_LABEL_CUSTOM_VIEWPORT_2:
+            base_msg = "Set Bottom-Right Corner";
+            break;
+      }
 
       snprintf(s, len, "%s (%d, %d : %4ux%4u)",
             base_msg, custom->x, custom->y, custom->width, custom->height);
@@ -559,7 +565,9 @@ static int action_iterate_main(const char *label, unsigned action)
             menu_displaylist_info_t info = {0};
 
             info.list = menu_list->menu_stack;
-            strlcpy(info.label, "help", sizeof(info.label));
+            strlcpy(info.label,
+                  menu_hash_to_str(MENU_LABEL_HELP),
+                  sizeof(info.label));
 
             menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
          }
diff --git a/menu/menu_hash.c b/menu/menu_hash.c
index c2dc282425..45e663c9d4 100644
--- a/menu/menu_hash.c
+++ b/menu/menu_hash.c
@@ -91,6 +91,8 @@ static const char *menu_hash_to_str_english(uint32_t hash)
          return "deferred_core_list_set";
       case MENU_LABEL_VALUE_TAKE_SCREENSHOT:
          return "Take Screenshot";
+      case MENU_LABEL_INFO_SCREEN:
+         return "info_screen";
       case MENU_LABEL_VALUE_RESUME:
          return "Resume";
       case MENU_LABEL_VALUE_DISK_INDEX:
@@ -228,6 +230,7 @@ static const char *menu_hash_to_str_english(uint32_t hash)
       case MENU_LABEL_AUDIO_DSP_PLUGIN:
          return "audio_dsp_plugin";
       default:
+         RARCH_LOG("Unhandled: %u\n", hash);
          break;
    }