Tweaks to ToC