Header fixes and adjustments