diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index afcd5ca378..96fd377d97 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -567,7 +567,7 @@ static bool ctr_frame(void* data, const void* frame,
       ctr->ppf_event_pending = false;
    }
 #ifndef HAVE_THREADS
-   if(task_queue_find(&ctr_tasks_finder_data))
+   if (task_queue_find(&ctr_tasks_finder_data))
    {
 #if 0
       ctr->vsync_event_pending = true;
@@ -576,9 +576,6 @@ static bool ctr_frame(void* data, const void* frame,
       {
          task_queue_check();
          svcSleepThread(0);
-#if 0
-         aptMainLoop();
-#endif
       }
    }
 #endif
diff --git a/tasks/task_core_updater.c b/tasks/task_core_updater.c
index e3f68784c6..8216170175 100644
--- a/tasks/task_core_updater.c
+++ b/tasks/task_core_updater.c
@@ -1208,7 +1208,8 @@ void task_push_update_installed_cores(const char *path_dir_libretro)
       goto error;
 
    /* Only one instance of this task may run at a time */
-   find_data.func = task_update_installed_cores_finder;
+   find_data.func     = task_update_installed_cores_finder;
+   find_data.userdata = NULL;
 
    if (task_queue_find(&find_data))
       goto error;