Fix up stuff that made Sphinx unhappy