Fixes to makeQuiz