Various fixes to make the extractors run.