Stabilizing for Windows build