Updates for the new Windows build.