Further header updates