Fixed header problems.