Correct dependencies and tasks to execute