Fixed some more issues with paths on Windows.