A number of small fixes to reduce warnings during doc build
Merge pull request #1896 from mdboom/doc-warnings

Remove some documentation build warnings