Fixes to direct Downloads