(WIN32) More path fixes