Question fixes and tweaks