Fix header and okay