Header fix up