More fixes for HTML tocs