additional controller fixes