More .zip support code updates