QUIZ: Add fixes for grading