Fixing more Grader calls