Update to the Download system

Nothing big. But still required.