diff --git a/libretro-common/utils/md5.c b/libretro-common/utils/md5.c
index 74131dd93d..3695cb7889 100644
--- a/libretro-common/utils/md5.c
+++ b/libretro-common/utils/md5.c
@@ -492,7 +492,7 @@ static void MDTestSuite(void)
    MDFile ("foo");
 }
 
-void main (int argc, char *argv[])
+int main (int argc, char *argv[])
 {
    int i;
 
@@ -514,6 +514,8 @@ void main (int argc, char *argv[])
          else if (strcmp (argv[i], "-x") == 0)
             MDTestSuite ();
          else MDFile (argv[i]);
+
+  return 0;
 }
 
 /*
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 3f08461a28..0639077abf 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -286,6 +286,9 @@ extern "C" {
 #define MENU_LABEL_REMAP_FILE_SAVE_CORE                                        0x7c9d4c8fU
 #define MENU_LABEL_REMAP_FILE_SAVE_GAME                                        0x7c9f41e0U
 #define MENU_LABEL_CONTENT_COLLECTION_LIST                                     0x0f8a9086U
+#define MENU_LABEL_OSK_ENABLE                                                  0x8e208498U
+#define MENU_LABEL_AUDIO_MUTE                                                  0xe0ca1151U
+#define MENU_LABEL_EXIT_EMULATOR                                               0x86d5d467U
 
 #ifdef __cplusplus
 }
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 57793b0d20..0ba80f3ffb 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2863,6 +2863,26 @@ static int setting_get_description_compare_label(uint32_t label_hash,
                "The modulation stops when the button \n"
                "itself (not turbo button) is released.");
          break;
+      case MENU_LABEL_OSK_ENABLE:
+           snprintf(s, len,
+               " -- Enable/disable on-screen keyboard.");
+           break;
+      case MENU_LABEL_AUDIO_MUTE:
+               snprintf(s, len,
+                        " -- Mute/unmute audio.");
+           break;
+      case MENU_LABEL_EXIT_EMULATOR:
+	   snprintf(s, len,
+			   " -- Key to exit RetroArch cleanly."
+#if !defined(RARCH_MOBILE) && !defined(RARCH_CONSOLE)
+			   "\nKilling it in any hard way (SIGKILL, \n"
+			   "etc) will terminate without saving\n"
+			   "RAM, etc. On Unix-likes,\n"
+			   "SIGINT/SIGTERM allows\n"
+			   "a clean deinitialization."
+#endif
+		   );
+         break;
       default:
          return -1;
    }
@@ -2905,17 +2925,6 @@ int setting_get_description(const char *label, char *s,
             " \n"
             "Positive X axis is right. \n"
             "Positive Y axis is down.");
-   else if (!strcmp(label, "exit_emulator"))
-      snprintf(s, len,
-            " -- Key to exit RetroArch cleanly."
-#if !defined(RARCH_MOBILE) && !defined(RARCH_CONSOLE)
-            "\nKilling it in any hard way (SIGKILL, \n"
-            "etc) will terminate without saving\n"
-            "RAM, etc. On Unix-likes,\n"
-            "SIGINT/SIGTERM allows\n"
-            "a clean deinitialization."
-#endif
-            );
    else if (!strcmp(label, "rewind"))
       snprintf(s, len,
             " -- Hold button down to rewind.\n"
@@ -2964,12 +2973,6 @@ int setting_get_description(const char *label, char *s,
    else if (!strcmp(label, "shader_prev"))
       snprintf(s, len,
             " -- Applies previous shader in directory.");
-   else if (!strcmp(label, "audio_mute"))
-      snprintf(s, len,
-            " -- Mute/unmute audio.");
-   else if (!strcmp(label, "osk_enable"))
-      snprintf(s, len,
-            " -- Enable/disable on-screen keyboard.");            
    else
       snprintf(s, len,
             "-- No info on this item is available. --\n");