Tasks fixes