downloader fixes (continued)