Fix header errors