Fix TOC and warnings