More i18n fixes
Couple more i18n fixes