Fixes to download manager