[Core] Patch up extractors with Zero Fixes