diff --git a/configuration.c b/configuration.c
index 5197b7dd29..3710a62a71 100644
--- a/configuration.c
+++ b/configuration.c
@@ -845,6 +845,8 @@ static config_file_t *open_default_config_file(void)
 {
    char conf_path[PATH_MAX_LENGTH] = {0};
    char app_path[PATH_MAX_LENGTH]  = {0};
+   const char *xdg                 = NULL;
+   const char *home                = NULL;
    config_file_t *conf             = NULL;
    bool saved                      = false;
    global_t *global                = global_get_ptr();
@@ -852,9 +854,8 @@ static config_file_t *open_default_config_file(void)
    (void)conf_path;
    (void)app_path;
    (void)saved;
-   
-   const char *xdg; (void)xdg;
-   const char *home; (void)home;
+   (void)xdg;
+   (void)home;
 
 #if defined(_WIN32) && !defined(_XBOX)
    fill_pathname_application_path(app_path, sizeof(app_path));
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 0f232e25a3..7e06411d09 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -780,9 +780,11 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
    {
       if (!menu_input->mouse.oldleft)
       {
+         rarch_setting_t *setting = NULL;
+
          BIT64_SET(*input_mouse, MOUSE_ACTION_BUTTON_L);
 
-         rarch_setting_t *setting = menu_setting_find(
+         setting = menu_setting_find(
                menu_list->selection_buf->list[nav->selection_ptr].label);
          menu_input->mouse.oldleft = true;
 
diff --git a/runloop.c b/runloop.c
index 2db6e2b05c..1a297c000b 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1115,17 +1115,17 @@ static void rarch_main_cmd_get_state(event_cmd_state_t *cmd,
 int rarch_main_iterate(void)
 {
    unsigned i;
-   retro_input_t trigger_input;
+   retro_input_t trigger_input, old_input;
    event_cmd_state_t    cmd        = {0};
    int ret                         = 0;
    static retro_input_t last_input = 0;
-   retro_input_t old_input         = last_input;
    retro_input_t input             = input_keys_pressed();
    driver_t *driver                = driver_get_ptr();
    settings_t *settings            = config_get_ptr();
    global_t   *global              = global_get_ptr();
    rarch_system_info_t *system     = rarch_system_info_get_ptr();
 
+   old_input                       = last_input;
    last_input                      = input;
 
    if (driver->flushing_input)