diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index ed276e5beb..3746c14bef 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -213,6 +213,7 @@ static void glui_render(void)
    menu_display_t *disp               = menu_display_get_ptr();
    menu_framebuf_t *frame_buf         = menu_display_fb_get_ptr();
    menu_handle_t *menu                = menu_driver_get_ptr();
+   menu_input_t *menu_input           = menu_input_get_ptr();
    settings_t *settings               = config_get_ptr();
 
    if (!menu || !menu->userdata)
@@ -360,6 +361,7 @@ static void glui_frame(void)
    menu_navigation_t *nav                  = menu_navigation_get_ptr();
    menu_display_t *disp                    = menu_display_get_ptr();
    settings_t *settings                    = config_get_ptr();
+   menu_input_t *menu_input                = menu_input_get_ptr();
    uint64_t *frame_count                   = video_driver_get_frame_count();
    const uint32_t normal_color             = FONT_COLOR_ARGB_TO_RGBA(
          settings->menu.entry_normal_color);
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 050d049105..09e78e3081 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -390,6 +390,7 @@ static void rgui_render(void)
    char title_msg[64];
    char timedate[PATH_MAX_LENGTH];
    menu_handle_t *menu            = menu_driver_get_ptr();
+   menu_input_t *menu_input       = menu_input_get_ptr();
    menu_display_t *disp           = menu_display_get_ptr();
    menu_framebuf_t *frame_buf     = menu_display_fb_get_ptr();
    menu_navigation_t *nav         = menu_navigation_get_ptr();
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 1ed5210405..fd42fa8345 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1410,6 +1410,7 @@ static void xmb_render(void)
    menu_handle_t    *menu   = menu_driver_get_ptr();
    menu_display_t   *disp   = menu_display_get_ptr();
    menu_animation_t *anim   = menu_animation_get_ptr();
+   menu_input_t *menu_input = menu_input_get_ptr();
    menu_navigation_t *nav   = menu_navigation_get_ptr();
    menu_list_t *menu_list   = menu_list_get_ptr();
 
@@ -1510,6 +1511,7 @@ static void xmb_frame(void)
    gl_t *gl                                = NULL;
    const struct font_renderer *font_driver = NULL;
    menu_handle_t   *menu                   = menu_driver_get_ptr();
+   menu_input_t *menu_input                = menu_input_get_ptr();
    menu_navigation_t *nav                  = menu_navigation_get_ptr();
    menu_list_t *menu_list                  = menu_list_get_ptr();
    settings_t   *settings                  = config_get_ptr();
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 18b9dac2a2..e5bbf2a9ff 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -403,7 +403,9 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
 static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
 {
-   char tmp[PATH_MAX_LENGTH];
+   char tmp[PATH_MAX_LENGTH]             = {0};
+   char tmp2[PATH_MAX_LENGTH]            = {0};
+
    settings_t *settings                = config_get_ptr();
    global_t *global                    = global_get_ptr();
 
diff --git a/menu/menu_iterate.c b/menu/menu_iterate.c
index 0c8c5a7936..3d47d37d8a 100644
--- a/menu/menu_iterate.c
+++ b/menu/menu_iterate.c
@@ -424,6 +424,7 @@ int menu_iterate(bool render_this_frame, unsigned action)
    uint32_t hash             = 0;
    menu_handle_t *menu       = menu_driver_get_ptr();
    menu_navigation_t *nav    = menu_navigation_get_ptr();
+   menu_display_t *disp      = menu_display_get_ptr();
    menu_list_t *menu_list    = menu_list_get_ptr();
 
    if (render_this_frame)