Some fixes to address issues created by the per-section config processing code