More header XML adjustments