More fixes for 12.2 build