Added controller fixes