Fix the rest of the tasks