Localization merge fixes