Merge pull request #1950 from tnull/2023-01-fix-doc-warnings-and-nits