Fixed issues in grader