Answer controller fixes