Small fixes to extraction process