Fixing build with 12.2 tools