Lightweight TOC fixes