Tweaks for section management