Made a few changes for testing downloads.