Wip grading fixes