More fixes in i18n