CXX-279 CXX-280 fixups