More header corrections.