Some fixes to quizzes