Some finishing touches to the FeatureUnion changes