Header fixes that got lost