Minor fixes to question support