Auto-link and TOC fix