Updating zip with latest fixes