Some fixes to the controllers