Fixes for download directory changes