Question flow fixes