Some final fixes on feature extraction