Fix headers once and for all