CXX-2 Fixups from code review