Fixes in controller