CXX-2 more review fixups