Fixing i18n glitches