More windows fixes (mostly path related)