Fixes to Zip helper