Win build fixes
Fix compile again