Build number 31 for Windows

Fixed

  • Some intermittent build errors