Fixes for downloading not working