Some zip bugs solved