Fix task queues