fixes for controller layer