Fixed header issues.