CXX-316 code review fixes