Fixed more Windows 7 path issues - paths containing brackets