Bug fixes on Downloader

Additional downloader fixes