Header and index corrections