More work on header improvements