Question fixes/fallbacks