CXX-80 minor changes