stopping task small fixes