Quick fixes to get question-multiple working