Edits rec'd by email, fixes DOC-957, fixes DOC-994