fixes to account for spaces in path on windows