Cleaned up a few TOC display issues