Fix operation of download and streaming.