Fix issues with Section/Subsection performance.