Fix change task bugs