Small changes to localization