controller fixes after smth changed in core