Fix header info, credit Bjarne