CXX-189 fixups