Fixes/windows buildbot