Fixes to make extractors run