Fix a lot of remaining issues with FeatureSet.