diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 98a220b3d9..0410744179 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -914,12 +914,10 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
             icon_y > gl->win_height + xmb->icon_size)
          continue;
 
-      cbs = (menu_file_list_cbs_t*)
-         menu_list_get_actiondata_at_offset(driver.menu->menu_list->selection_buf,
-               i);
+      cbs = (menu_file_list_cbs_t*)menu_list_get_actiondata_at_offset(list, i);
 
       if (cbs && cbs->action_get_representation)
-         cbs->action_get_representation(driver.menu->menu_list->selection_buf,
+         cbs->action_get_representation(list,
                &w, type, i, label,
                type_str, sizeof(type_str), 
                entry_label, path,
diff --git a/settings_data.c b/settings_data.c
index 738935f24e..822a5f0537 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -2784,7 +2784,7 @@ static void get_string_representation_savestate(void * data, char *type_str,
  *
  * Get associated label of a setting.
  **/
-void setting_data_get_label(void *data, char *type_str,
+void setting_data_get_label(file_list_t *list, char *type_str,
       size_t type_str_size, unsigned *w, unsigned type, 
       const char *menu_label, const char *label, unsigned idx)
 {
@@ -2800,7 +2800,7 @@ void setting_data_get_label(void *data, char *type_str,
       return;
 
    setting = (rarch_setting_t*)setting_data_find_setting(setting_data,
-         driver.menu->menu_list->selection_buf->list[idx].label);
+         list->list[idx].label);
 
    if (setting)
       setting_data_get_string_representation(setting, type_str, type_str_size);
diff --git a/settings_data.h b/settings_data.h
index 091c2855f2..3a8ce9dbad 100644
--- a/settings_data.h
+++ b/settings_data.h
@@ -305,7 +305,7 @@ int setting_data_get_description(const char *label, char *msg,
  *
  * Get associated label of a setting.
  **/
-void setting_data_get_label(void *data, char *type_str,
+void setting_data_get_label(file_list_t *list, char *type_str,
       size_t type_str_size, unsigned *w, unsigned type, 
       const char *menu_label, const char *label, unsigned idx);
 #endif