Some fixes to IPC