Fix header and map