Make handling of downloads more proper for non-MVDSV servers