Fix some Sphinx warnings
Merge branch 'fix-some-sphinx-warnings'