Fix header and add ipc event