diff --git a/menu/drivers/null.c b/menu/drivers/null.c
index 5066738ebd..d68d1d7921 100644
--- a/menu/drivers/null.c
+++ b/menu/drivers/null.c
@@ -45,9 +45,9 @@ static void null_toggle(void *userdata, bool menu_on)
    g_menu_on = menu_on;
 }
 
-static int null_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_action action)
+static int null_menu_iterate(void *data, void *userdata, enum menu_action action)
 {
-   (void)menu;
+   (void)data;
    (void)userdata;
    (void)action;
 
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 974ea24843..2b6aa0f362 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -2037,13 +2037,14 @@ bool menu_driver_render(bool is_idle, bool rarch_is_inited,
       BIT64_SET(menu_driver_data->state, MENU_STATE_RENDER_FRAMEBUFFER);
 
    if (BIT64_GET(menu_driver_data->state, MENU_STATE_RENDER_FRAMEBUFFER))
-      menu_display_framebuf_dirty = true;
+      menu_display_set_framebuffer_dirty_flag();
 
    if (BIT64_GET(menu_driver_data->state, MENU_STATE_RENDER_MESSAGEBOX)
          && !string_is_empty(menu_driver_data->menu_state_msg))
    {
       if (menu_driver_data->driver_ctx->render_messagebox)
-         menu_driver_data->driver_ctx->render_messagebox(menu_userdata,
+         menu_driver_data->driver_ctx->render_messagebox(
+               menu_driver_data->userdata,
                menu_driver_data->menu_state_msg);
 
       if (ui_companion_is_on_foreground())
@@ -2057,7 +2058,8 @@ bool menu_driver_render(bool is_idle, bool rarch_is_inited,
    if (BIT64_GET(menu_driver_data->state, MENU_STATE_BLIT))
    {
       if (menu_driver_data->driver_ctx->render)
-         menu_driver_data->driver_ctx->render(menu_userdata, is_idle);
+         menu_driver_data->driver_ctx->render(
+               menu_driver_data->userdata, is_idle);
    }
 
    if (menu_driver_alive && !is_idle)
@@ -2208,6 +2210,7 @@ static bool menu_driver_init_internal(bool video_is_threaded)
    {
       menu_driver_data               = (menu_handle_t*)
          menu_driver_ctx->init(&menu_userdata, video_is_threaded);
+      menu_driver_data->userdata     = menu_userdata;
       menu_driver_data->driver_ctx   = menu_driver_ctx;
    }
 
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 766d48c265..4e841a569d 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -351,6 +351,7 @@ typedef struct
       unsigned                unsigned_var;
    } scratchpad;
    const menu_ctx_driver_t *driver_ctx;
+   void *userdata;
 } menu_handle_t;
 
 struct menu_display_ctx_draw