Fixes for 6.0 and toc bump