Misc changes for DoQuiz.