Tweaked extraction checks again to stop forcing compression