Fixed couple problems with tasks_queue migration