Localization: Minor fixes