Fixed errors related to i18n