More tweaks to zip streaming