Fixes in the controller