Add ZIP-making fix; apply to build/core