Windows build fixing