Removed subtle bugs

The TOC driver seriously needs a refactor