Account for spaces in filenames