Building with 12.2 tools

Trying to ensure that everything builds with 12.2 tools.