Some fixes - grab the parent dir information if we're expecting
a file name but none is given, and some special handling for the
Desktop folder