download() fixes