Resolve some Sphinx warnings/errors