More work on the downloader and 1.6 instance creation