Deal with spaces in filenames better