Index: uspace/srv/console/console.c
===================================================================
--- uspace/srv/console/console.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/console/console.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -382,5 +382,5 @@
 	async_serialize_start();
 	gcons_notify_connect(consnum);
-	conn->client_phone = IPC_GET_ARG3(call);
+	conn->client_phone = IPC_GET_ARG5(*icall);
 	screenbuffer_clear(&conn->screenbuffer);
 	
@@ -489,5 +489,5 @@
 	}
 	
-	if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0)
+	if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
 		return -1;
 	async_new_connection(phonehash, 0, NULL, keyboard_events);
@@ -551,5 +551,5 @@
 
 	/* Register at NS */
-	if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) {
+	if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
 		return -1;
 	}
Index: uspace/srv/devmap/devmap.c
===================================================================
--- uspace/srv/devmap/devmap.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/devmap/devmap.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -270,5 +270,5 @@
 	}
 
-	driver->phone = IPC_GET_ARG3(call);
+	driver->phone = IPC_GET_ARG5(call);
 	
 	ipc_answer_0(callid, EOK);
@@ -736,5 +736,5 @@
 
 	/* Register device mapper at naming service */
-	if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, &phonead) != 0) 
+	if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, 0, &phonead) != 0) 
 		return -1;
 	
Index: uspace/srv/fb/main.c
===================================================================
--- uspace/srv/fb/main.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/fb/main.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -73,5 +73,5 @@
 		sysio_init();
 
-	if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, &phonead) != 0) 
+	if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0) 
 		return -1;
 	
Index: uspace/srv/fs/fat/fat.c
===================================================================
--- uspace/srv/fs/fat/fat.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/fs/fat/fat.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -154,5 +154,5 @@
 	 */
 	ipcarg_t phonehash;
-	ipc_connect_to_me(vfs_phone, 0, 0, &phonehash);
+	ipc_connect_to_me(vfs_phone, 0, 0, 0, &phonehash);
 
 	/*
Index: uspace/srv/kbd/generic/kbd.c
===================================================================
--- uspace/srv/kbd/generic/kbd.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/kbd/generic/kbd.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -109,5 +109,5 @@
 				break;
 			}
-			phone2cons = IPC_GET_ARG3(call);
+			phone2cons = IPC_GET_ARG5(call);
 			retval = 0;
 			break;
@@ -134,5 +134,5 @@
 	async_set_interrupt_received(irq_handler);
 	/* Register service at nameserver */
-	if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, &phonead) != 0)
+	if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
 		return -1;
 
Index: uspace/srv/ns/ns.c
===================================================================
--- uspace/srv/ns/ns.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/ns/ns.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -140,5 +140,5 @@
 			 */
 			retval = register_service(IPC_GET_ARG1(call),
-			    IPC_GET_ARG3(call), &call);
+			    IPC_GET_ARG5(call), &call);
 			break;
 		case IPC_M_CONNECT_ME_TO:
Index: uspace/srv/pci/pci.c
===================================================================
--- uspace/srv/pci/pci.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/pci/pci.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -58,5 +58,5 @@
 
 	printf("%s: registering at naming service.\n", NAME);
-	if (ipc_connect_to_me(PHONE_NS, SERVICE_PCI, 0, &ns_in_phone_hash) != 0) {
+	if (ipc_connect_to_me(PHONE_NS, SERVICE_PCI, 0, 0, &ns_in_phone_hash) != 0) {
 		printf("Failed to register %s at naming service.\n", NAME);
 		return -1;
Index: uspace/srv/rd/rd.c
===================================================================
--- uspace/srv/rd/rd.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/rd/rd.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -212,5 +212,5 @@
 		
 		/* Register service at nameserver */
-		if (ipc_connect_to_me(PHONE_NS, SERVICE_RD, 0, &phonead) != 0)
+		if (ipc_connect_to_me(PHONE_NS, SERVICE_RD, 0, 0, &phonead) != 0)
 			return -1;
 		
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/vfs/vfs.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -158,5 +158,5 @@
 	 * Register at the naming service.
 	 */
-	ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, &phonead);
+	ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, 0, &phonead);
 
 	/*
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision b61d47d14bdea0c512d1a9a0ce603ef37ac239bc)
+++ uspace/srv/vfs/vfs_register.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
@@ -253,5 +253,5 @@
 		return;
 	}
-	fs_info->phone = IPC_GET_ARG3(call);
+	fs_info->phone = IPC_GET_ARG5(call);
 	ipc_answer_0(callid, EOK);