more TOC bugsmashings
Merge branch 'charlie'

* charlie:
  more TOC bugsmashings