Some of the fixes for quiz assessments