Fixes in windows path funcs