More doc fixes

Fix a couple of more Sphinx errors in the doc build