(MSVC) More path fixes