A few header adjustments