cancel task fixes