Fixed Windows build errors and got JSON tests passing.

[#53261073]