Fix header column count