Various fixes to make Sphinx happy.