diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index dc9d2e55ad..53015ec666 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1251,7 +1251,7 @@ enum
 
 static int generic_action_ok_file_load(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx,
-      unsigned action_type, unsigned id)
+      enum rarch_core_type action_type, unsigned id)
 {
    const char *menu_path    = NULL;
    global_t *global         = global_get_ptr();
@@ -1855,7 +1855,7 @@ static int action_ok_load_archive_detect_core(const char *path,
 
 static int  generic_action_ok_help(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx,
-      unsigned id, unsigned id2)
+      unsigned id, menu_help_type_t id2)
 {
    menu_displaylist_info_t info = {0};
    menu_list_t *menu_list    = menu_list_get_ptr();
diff --git a/menu/menu_list.c b/menu/menu_list.c
index 3880acb2f3..47dd088fc0 100644
--- a/menu/menu_list.c
+++ b/menu/menu_list.c
@@ -122,11 +122,11 @@ menu_file_list_cbs_t *menu_list_get_actiondata_at_offset(
       file_list_get_actiondata_at_offset(list, idx);
 }
 
-void *menu_list_get_last_stack_actiondata(const menu_list_t *list)
+menu_file_list_cbs_t *menu_list_get_last_stack_actiondata(const menu_list_t *list)
 {
    if (!list)
       return NULL;
-   return file_list_get_last_actiondata(list->menu_stack);
+   return (menu_file_list_cbs_t*)file_list_get_last_actiondata(list->menu_stack);
 }
 
 static int menu_list_flush_stack_type(
diff --git a/menu/menu_list.h b/menu/menu_list.h
index a5fce0425a..64a9008a3b 100644
--- a/menu/menu_list.h
+++ b/menu/menu_list.h
@@ -97,7 +97,7 @@ size_t menu_list_get_stack_size(menu_list_t *list);
 
 size_t menu_list_get_size(menu_list_t *list);
 
-void *menu_list_get_last_stack_actiondata(const menu_list_t *list);
+menu_file_list_cbs_t *menu_list_get_last_stack_actiondata(const menu_list_t *list);
 
 void menu_list_get_last(const file_list_t *list,
       const char **path, const char **label,