diff --git a/menu/menu_common.h b/menu/menu_common.h
index fa6e563df2..6731b87dd6 100644
--- a/menu/menu_common.h
+++ b/menu/menu_common.h
@@ -134,7 +134,6 @@ typedef enum
    MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND,
    MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS,
 
-   // Match up with libretro order for simplicity.
    MENU_SETTINGS_BIND_BEGIN,
    MENU_SETTINGS_BIND_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_Y_MINUS,
    MENU_SETTINGS_BIND_ALL_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_MENU_TOGGLE,
diff --git a/menu/menu_shader.c b/menu/menu_shader.c
index 4250c0449d..3cacc9e0f5 100644
--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@@ -23,6 +23,7 @@
 void menu_shader_manager_init(void *data)
 {
    char cgp_path[PATH_MAX_LENGTH];
+   const char *ext;
    struct gfx_shader *shader = NULL;
    config_file_t *conf = NULL;
    const char *config_path = NULL;
@@ -58,8 +59,7 @@ void menu_shader_manager_init(void *data)
       strlcpy(menu->default_cgp, "menu.cgp", sizeof(menu->default_cgp));
    }
 
-
-   const char *ext = path_get_extension(g_settings.video.shader_path);
+   ext = path_get_extension(g_settings.video.shader_path);
    if (strcmp(ext, "glslp") == 0 || strcmp(ext, "cgp") == 0)
    {
       conf = config_file_new(g_settings.video.shader_path);