Fixed more grader errors