diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c
index caa6e56c93..3b25f340d9 100644
--- a/libretro-common/net/net_http.c
+++ b/libretro-common/net/net_http.c
@@ -138,6 +138,7 @@ void net_http_urlencode_full(char *dest,
    char *tmp                         = NULL;
    char url_domain[PATH_MAX_LENGTH]  = {0};
    char url_path[PATH_MAX_LENGTH]    = {0};
+   char url_encoded[PATH_MAX_LENGTH] = {0};
    int count                         = 0;
 
    strlcpy (url_path, source, sizeof(url_path));
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 0fab70e26c..f7d85028dd 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3282,12 +3282,15 @@ static int menu_displaylist_parse_options_remappings(
       {
          for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
          {
+            unsigned user           = settings->uints.keymapper_port + 1;
+            unsigned desc_offset    = retro_id;
             char descriptor[255];
-            const struct retro_keybind *keybind   = &input_config_binds[settings->uints.keymapper_port][retro_id];
-            const struct retro_keybind *auto_bind = (const struct retro_keybind*)
-               input_config_get_bind_auto(settings->uints.keymapper_port, retro_id);
+            const struct retro_keybind *auto_bind = NULL;
+            const struct retro_keybind *keybind   = NULL;
 
-            descriptor[0]                         = '\0';
+            keybind   = &input_config_binds[settings->uints.keymapper_port][retro_id];
+            auto_bind = (const struct retro_keybind*)
+               input_config_get_bind_auto(settings->uints.keymapper_port, retro_id);
 
             input_config_get_bind_string(descriptor,
                keybind, auto_bind, sizeof(descriptor));