Fix stored position.
Fix grader on end.