final fixes for download manager support