CXX-237 changes after first review