Fixed issues with i18n encoding