Improve a bit the localization support