Tweaks and fixes to the ToC