CXX-81 Additional fixups