More Windows build fixing.