some Windows build fixes