Fixing zip bugs