QuizBundle fixes