Some fixes to feature_i18n