A few more extractions and tweaks