Minor fixes / renaming to get question page to work.