Building on 12.2 tools

Getting everything building with the 12.2 tools.