Start/end task fixes