further ipc-oriented modifications