CXX-175 fixups