Fix Windows build more.