More fixes for the Windows build