Fix broken tasks
Update tasks