diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 528a4f86b4..b447156511 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -5355,27 +5355,23 @@ static void menu_entries_cbs_init_bind_refresh(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1)
 {
-   if (!cbs || !driver.menu)
-      return;
-
-   cbs->action_refresh = action_refresh_default;
+   if (cbs)
+      cbs->action_refresh = action_refresh_default;
 }
 
 static void menu_entries_cbs_init_bind_iterate(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1)
 {
-   if (!cbs || !driver.menu)
-      return;
-
-   cbs->action_iterate = action_iterate_main;
+   if (cbs)
+      cbs->action_iterate = action_iterate_main;
 }
 
 static void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1)
 {
-   if (!cbs || !driver.menu)
+   if (!cbs)
       return;
 
    if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
@@ -5524,7 +5520,7 @@ static void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1)
 {
-   if (!cbs || !driver.menu)
+   if (!cbs)
       return;
 
    cbs->action_deferred_push = deferred_push_default;
diff --git a/menu/menu_shader.c b/menu/menu_shader.c
index 2cb73f094e..6b14d1c92e 100644
--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@@ -24,7 +24,7 @@
  *
  * Initializes shader manager.
  **/
-void menu_shader_manager_init(void *data)
+void menu_shader_manager_init(menu_handle_t *menu)
 {
 #ifdef HAVE_SHADER_MANAGER
    char preset_path[PATH_MAX_LENGTH];
@@ -32,7 +32,6 @@ void menu_shader_manager_init(void *data)
    struct video_shader *shader = NULL;
    config_file_t *conf = NULL;
    const char *config_path = NULL;
-   menu_handle_t *menu = (menu_handle_t*)data;
 
    if (!menu)
       return;
diff --git a/menu/menu_shader.h b/menu/menu_shader.h
index c62c20a7d1..991441d53b 100644
--- a/menu/menu_shader.h
+++ b/menu/menu_shader.h
@@ -28,7 +28,7 @@ extern "C" {
  *
  * Initializes shader manager.
  **/
-void menu_shader_manager_init(void *data);
+void menu_shader_manager_init(menu_handle_t *menu);
 
 /**
  * menu_shader_manager_set_preset: