Some header adjustments