Get more compiling on MSVC Diffs= 1a271c437 Get more compiling on MSVC (#5547) Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>