Fixing grading and dispute submit errors