More question fixes