Controllers localization fixes