Minor clean-up to zip support