Add Windows build related changes