diff --git a/gfx/drivers_shader/shader_vulkan.cpp b/gfx/drivers_shader/shader_vulkan.cpp
index 813903caff..70b8a292ea 100644
--- a/gfx/drivers_shader/shader_vulkan.cpp
+++ b/gfx/drivers_shader/shader_vulkan.cpp
@@ -2800,18 +2800,18 @@ static bool vulkan_filter_chain_load_luts(
       VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
    VkSubmitInfo submit_info                      = {
       VK_STRUCTURE_TYPE_SUBMIT_INFO };
-   VkCommandBuffer cmd = VK_NULL_HANDLE;
-   VkCommandBufferAllocateInfo cmd_info = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
-   bool recording = false;
+   VkCommandBuffer cmd                           = VK_NULL_HANDLE;
+   VkCommandBufferAllocateInfo cmd_info          = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
+   bool recording                                = false;
 
    cmd_info.commandPool        = info->command_pool;
    cmd_info.level              = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
    cmd_info.commandBufferCount = 1;
 
    vkAllocateCommandBuffers(info->device, &cmd_info, &cmd);
-   begin_info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+   begin_info.flags            = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
    vkBeginCommandBuffer(cmd, &begin_info);
-   recording = true;
+   recording                   = true;
 
    for (unsigned i = 0; i < shader->luts; i++)
    {
@@ -2826,9 +2826,8 @@ static bool vulkan_filter_chain_load_luts(
    }
 
    vkEndCommandBuffer(cmd);
-   recording = false;
    submit_info.commandBufferCount = 1;
-   submit_info.pCommandBuffers = &cmd;
+   submit_info.pCommandBuffers    = &cmd;
    vkQueueSubmit(info->queue, 1, &submit_info, VK_NULL_HANDLE);
    vkQueueWaitIdle(info->queue);
    vkFreeCommandBuffers(info->device, info->command_pool, 1, &cmd);
diff --git a/libretro-common/queues/task_queue.c b/libretro-common/queues/task_queue.c
index 4829cbbbe8..2450cc09c4 100644
--- a/libretro-common/queues/task_queue.c
+++ b/libretro-common/queues/task_queue.c
@@ -250,19 +250,17 @@ static void retro_task_regular_retrieve(task_retriever_data_t *data)
          if (tail)
          {
             tail->next = info;
-            tail = tail->next;
+            tail       = tail->next;
          }
-         else tail = info;
+         else
+            tail       = info;
       }
       else
       {
-         data->list = info;
-         tail = data->list;
+         data->list    = info;
+         tail          = data->list;
       }
    }
-
-   if (tail)
-      free(tail);
 }
 
 static struct retro_task_impl impl_regular = {
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 4192f42359..2e0bf85d6a 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -618,8 +618,10 @@ static const struct retro_subsystem_info *init_content_file_subsystem(bool *ret)
             msg_hash_to_str(MSG_ERROR_LIBRETRO_CORE_REQUIRES_SPECIAL_CONTENT));
       goto error;
    }
-   else if (special->num_roms && special->num_roms
-         != global->subsystem_fullpaths->size)
+   else if ((global 
+         && special->num_roms)
+         && (special->num_roms
+         != global->subsystem_fullpaths->size))
    {
       RARCH_ERR("Libretro core requires %u content files for "
             "subsystem \"%s\", but %u content files were provided.\n",