Small changes to genFeatures