Fixed header issues