Minor tweaks for localization