Fixed header inconsistencies