Fixes to extraction step