AC-7968 Clarify some docs and fix a small problem