Fixing i18n issues.