Zip fixes