more fixes for downloads