Fix up feature_set