Windows build changes.