Additional localization fixes