Misc cleanups
Support for files with spaces