Fix two problems in the ZIP downloader, as reported by
ticket [e28adcd72503a].