Some i18n fixes