Additional fixes for Download Directory.