fix specs and misc errors after controller reorganization