More fixes to get things to build with 12.2 tools