Fix header and client