Don't quote any filenames...
Merge branch 'misc_fixes'