More changes to localization

I'm not sure of the problem. I'll get back to localization at a later
point