Fixup some headers