More toc fixes