Fixes to create toc element in doc