Minor changes to AnswerAdapter