Grades Bug fixes.