Fix some issues with the extraction step.