Another round of header adjustments