Fix header issues