Patch to address zip finalization in 0.10.x