Fixed issues with spaces in filenames