Task model fixes