More localization fixes