Fixed a couple of bugs in Download task. Removed workarounds that are no longer necessary.