Some notable zip bugfixing