More DownloadWindow fixes