some fixes for TOC