Localization improvements