Fixes on i18n_fields