Fixed question bugs