Fixes to Download