Further localization tweaks