DOC-1198: more fixes