Use correct task dependencies