More adjustments for headers