diff --git a/tasks/task_content.c b/tasks/task_content.c
index 4ad49ff655..ea03d8857e 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -654,6 +654,7 @@ static bool content_file_load(
 
             fill_pathname_join(new_path, new_basedir,
                path_basename(path), new_path_size);
+            free(new_basedir);
 
             /* TODO: This may fail on very large files...
              * but copying large files is not a good idea anyway */
@@ -697,7 +698,6 @@ static bool content_file_load(
             string_list_append(content_ctx->temporary_content,
                new_path, attributes);
 
-            free(new_basedir);
             free(new_path);
 
             used_vfs_fallback_copy = true;
@@ -741,11 +741,20 @@ static bool content_file_load(
       settings_t *settings         = config_get_ptr();
       const char *content_path     = content->elems[0].data;
       enum rarch_content_type type = path_is_media_type(content_path);
+      bool cheevos_old_enable      = settings->bools.cheevos_old_enable;
 
-      !settings->bools.cheevos_old_enable ? rcheevos_set_cheats() : cheevos_set_cheats();
+      if (cheevos_old_enable)
+         cheevos_set_cheats();
+      else
+         rcheevos_set_cheats();
 
       if (type == RARCH_CONTENT_NONE && !string_is_empty(content_path))
-         !settings->bools.cheevos_old_enable ? rcheevos_load(info) : cheevos_load(info);
+      {
+         if (cheevos_old_enable)
+            cheevos_load(info);
+         else
+            rcheevos_load(info);
+      }
    }
 #endif
 
diff --git a/tasks/task_pl_thumbnail_download.c b/tasks/task_pl_thumbnail_download.c
index 70b36a2b67..84bdce31a9 100644
--- a/tasks/task_pl_thumbnail_download.c
+++ b/tasks/task_pl_thumbnail_download.c
@@ -30,9 +30,14 @@
 
 #include "../file_path_special.h"
 #include "../playlist.h"
+
+#ifdef RARCH_INTERNAL
+#ifdef HAVE_MENU
 #include "../menu/menu_thumbnail_path.h"
 #include "../menu/menu_cbs.h"
 #include "../menu/menu_driver.h"
+#endif
+#endif
 
 #ifndef COLLECTION_SIZE
 #define COLLECTION_SIZE 99999
@@ -229,7 +234,9 @@ static void cb_task_pl_thumbnail_refresh_menu(
       retro_task_t *task, void *task_data,
       void *user_data, const char *err)
 {
+#if defined(RARCH_INTERNAL) && defined(HAVE_MENU)
    menu_driver_ctl(RARCH_MENU_CTL_REFRESH_THUMBNAIL_IMAGE, NULL);
+#endif
 }
 
 /*******************************/