Fixes to toc