TOC, minor patches