Fixes for the quiz components