Fixed some directory names and handling of spaces in filepaths for the windows builds