diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 0b78f67eca..0274911671 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1126,7 +1126,7 @@ int generic_action_ok_displaylist_push(const char *path,
          {
             content_ctx_info_t content_info = {0};
             filebrowser_clear_type();
-            task_push_load_subsystem_with_core_from_menu(
+            task_push_load_subsystem_with_core(
                   NULL, &content_info,
                   CORE_TYPE_PLAIN, NULL, NULL);
          }
@@ -2138,7 +2138,7 @@ static int default_action_ok_load_content_with_core_from_menu(const char *_path,
    content_info.argv                   = NULL;
    content_info.args                   = NULL;
    content_info.environ_get            = NULL;
-   if (!task_push_load_content_with_core_from_menu(
+   if (!task_push_load_content_with_core(
             _path, &content_info,
             (enum rarch_core_type)_type, NULL, NULL))
       return -1;
@@ -2502,7 +2502,7 @@ static int action_ok_playlist_entry_collection(const char *path,
       for (i = 0; i < entry->subsystem_roms->size; i++)
          content_add_subsystem(entry->subsystem_roms->elems[i].data);
 
-      task_push_load_subsystem_with_core_from_menu(
+      task_push_load_subsystem_with_core(
             NULL, &content_info,
             CORE_TYPE_PLAIN, NULL, NULL);
 
@@ -2692,7 +2692,7 @@ static int action_ok_load_cdrom(const char *path,
          content_info.args        = NULL;
          content_info.environ_get = NULL;
 
-         task_push_load_content_with_core_from_menu(cdrom_path, &content_info, CORE_TYPE_PLAIN, NULL, NULL);
+         task_push_load_content_with_core(cdrom_path, &content_info, CORE_TYPE_PLAIN, NULL, NULL);
       }
 #else
       frontend_driver_set_fork(FRONTEND_FORK_CORE_WITH_ARGS);
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 58a40dc409..11bd084c7a 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -39,6 +39,7 @@
 #include "menu_driver.h"
 #include "menu_cbs.h"
 #include "../driver.h"
+#include "../list_special.h"
 #include "../paths.h"
 #include "../tasks/task_powerstate.h"
 #include "../tasks/tasks_internal.h"
diff --git a/retroarch.c b/retroarch.c
index 0d7d8942a7..8322c9480a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1682,9 +1682,7 @@ bool menu_shader_manager_set_preset(struct video_shader *shader,
    ret = true;
 
 end:
-#ifdef HAVE_MENU
    menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
-#endif
    command_event(CMD_EVENT_SHADER_PRESET_LOADED, NULL);
    return ret;