Some changes on i18n