Fix up headers