Fix TOC location tracking and initialization