More DownloadHandler improvements.