Quiz Fixes