MSVC buildfix

20 jobs for master in 22 minutes and 13 seconds (queued for 28 minutes and 43 seconds)