some fixes to take care of default file manager settings
Merge branch 'upload-destination-config'