diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 3c2cd83e56..5fd6043f27 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -138,6 +138,8 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
          "temp", sizeof(g_defaults.dir.cache));
    fill_pathname_join(g_defaults.dir.overlay, user_path,
          "overlays", sizeof(g_defaults.dir.overlay));
+   fill_pathname_join(g_defaults.dir.thumbnails, user_path,
+         "thumbnails", sizeof(g_defaults.dir.thumbnails));
    strlcpy(g_defaults.dir.content_history,
          user_path, sizeof(g_defaults.dir.content_history));
    fill_pathname_join(g_defaults.path.config, user_path,
@@ -210,8 +212,9 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    path_mkdir(g_defaults.dir.screenshot);
    path_mkdir(g_defaults.dir.sram);
    path_mkdir(g_defaults.dir.system);
-   /* path_mkdir(g_defaults.dir.thumbnails); */
-
+#ifdef VITA
+   path_mkdir(g_defaults.dir.thumbnails);
+#endif
    /* create cache dir */
    path_mkdir(g_defaults.dir.cache);
 
@@ -466,6 +469,8 @@ static int frontend_psp_parse_drive_list(void *data)
    file_list_t *list = (file_list_t*)data;
 
 #ifdef VITA
+   menu_entries_append_enum(list,
+         "app0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_append_enum(list,
          "ur0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_append_enum(list,
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 185dc27d35..a7c9caa4fe 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2066,16 +2066,13 @@ static int generic_action_ok_network(const char *path,
 
    url_path[0] = '\0';
 
-   menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
-
-   if (string_is_empty(settings->network.buildbot_url))
-      return menu_cbs_exit();
-
-   command_event(CMD_EVENT_NETWORK_INIT, NULL);
-
    switch (enum_idx)
    {
       case MENU_ENUM_LABEL_CB_CORE_CONTENT_DIRS_LIST:
+
+         if (string_is_empty(settings->network.buildbot_assets_url))
+            return menu_cbs_exit();
+
          fill_pathname_join(url_path, settings->network.buildbot_assets_url,
                "cores/.index-dirs", sizeof(url_path));
          url_label = msg_hash_to_str(enum_idx);
@@ -2092,6 +2089,10 @@ static int generic_action_ok_network(const char *path,
          suppress_msg = true;
          break;
       case MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST:
+
+         if (string_is_empty(settings->network.buildbot_url))
+            return menu_cbs_exit();
+
          fill_pathname_join(url_path, settings->network.buildbot_url,
                file_path_str(FILE_PATH_INDEX_EXTENDED_URL), sizeof(url_path));
          url_label = msg_hash_to_str(enum_idx);
@@ -2123,6 +2124,10 @@ static int generic_action_ok_network(const char *path,
       default:
          break;
    }
+   
+   menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
+
+   command_event(CMD_EVENT_NETWORK_INIT, NULL);
 
    transf           = (menu_file_transfer_t*)calloc(1, sizeof(*transf));
    strlcpy(transf->path, url_path, sizeof(transf->path));
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 8b53195c1a..1eecd5d75f 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2914,11 +2914,13 @@ static int menu_displaylist_parse_options(
          MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST,
          MENU_SETTING_ACTION, 0, 0);
 #else
+#if !defined(VITA)
    menu_entries_append_enum(info->list,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST),
          msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST),
          MENU_ENUM_LABEL_CORE_UPDATER_LIST,
          MENU_SETTING_ACTION, 0, 0);
+#endif
 
    menu_entries_append_enum(info->list,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST),
@@ -2926,11 +2928,13 @@ static int menu_displaylist_parse_options(
          MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST,
          MENU_SETTING_ACTION, 0, 0);
 
+#if !defined(VITA)
    menu_entries_append_enum(info->list,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES),
          msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES),
          MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES,
          MENU_SETTING_ACTION, 0, 0);
+#endif
 
 #ifdef HAVE_UPDATE_ASSETS
    menu_entries_append_enum(info->list,
@@ -2953,11 +2957,13 @@ static int menu_displaylist_parse_options(
          MENU_SETTING_ACTION, 0, 0);
 
 #ifdef HAVE_LIBRETRODB
+#if !defined(VITA)
    menu_entries_append_enum(info->list,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES),
          msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_DATABASES),
          MENU_ENUM_LABEL_UPDATE_DATABASES,
          MENU_SETTING_ACTION, 0, 0);
+#endif
 #endif
 
    menu_entries_append_enum(info->list,