Yet more fixes for DownloadHandler.