Fixes to ToC adviced by tjm