Fix issues with feature extraction