Various changes required to get the downloader working.