Fix issue with spaces in folder names.