i18n - minor bug fixies