Even more corrections to toctree