Fixes to extraction