CXX-20 last minor fixups