Index: abi/include/abi/ipc/interfaces.h
===================================================================
--- abi/include/abi/ipc/interfaces.h	(revision 5be636105b3cdb8ad0eb0aaa7fa4fdda0d6c9413)
+++ abi/include/abi/ipc/interfaces.h	(revision 7ffdcbd812712c8d7655c0e0838d5cbaa7aeb11f)
@@ -82,6 +82,4 @@
 typedef enum {
 	INTERFACE_ANY = 0,
-	INTERFACE_LOADER =
-	    FOURCC_COMPACT('l', 'o', 'a', 'd') | IFACE_EXCHANGE_SERIALIZE,
 	INTERFACE_PAGER =
 	    FOURCC_COMPACT('p', 'a', 'g', 'e') | IFACE_EXCHANGE_ATOMIC,
@@ -190,6 +188,4 @@
 	INTERFACE_TASKMAN_CB =
 	    FOURCC_COMPACT('t', 'a', 's', 'k') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
-	INTERFACE_NS =
-	    FOURCC_COMPACT('n', 's', ' ', ' ') | IFACE_EXCHANGE_ATOMIC,
 	INTERFACE_SYSMAN =
 	    FOURCC_COMPACT('s', 'y', 's', 'm') | IFACE_EXCHANGE_SERIALIZE
Index: uspace/lib/c/generic/taskman.c
===================================================================
--- uspace/lib/c/generic/taskman.c	(revision 5be636105b3cdb8ad0eb0aaa7fa4fdda0d6c9413)
+++ uspace/lib/c/generic/taskman.c	(revision 7ffdcbd812712c8d7655c0e0838d5cbaa7aeb11f)
@@ -69,5 +69,5 @@
 	async_exchange_end(exch);
 }
-
+#include <stdio.h>
 /** Wrap PHONE_INITIAL with session and introduce to taskman
  */
@@ -101,5 +101,5 @@
 	async_exch_t *exch = taskman_exchange_begin();
 
-	async_sess_t *sess = async_connect_me_to(exch, INTERFACE_NS,
+	async_sess_t *sess = async_connect_me_to(exch, INTERFACE_ANY,
 	    TASKMAN_CONNECT_TO_NS, 0);
 	taskman_exchange_end(exch);
@@ -112,5 +112,5 @@
 {
 	async_exch_t *exch = taskman_exchange_begin();
-	async_sess_t *sess = async_connect_me_to(exch, INTERFACE_LOADER,
+	async_sess_t *sess = async_connect_me_to(exch, INTERFACE_ANY,
 	    TASKMAN_CONNECT_TO_LOADER, 0);
 	taskman_exchange_end(exch);
@@ -135,5 +135,5 @@
 {
 	async_exch_t *exch = taskman_exchange_begin();
-	errno_t rc = async_connect_to_me(exch, INTERFACE_LOADER, TASKMAN_LOADER_CALLBACK, 0);
+	errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, TASKMAN_LOADER_CALLBACK, 0);
 	taskman_exchange_end(exch);
 
@@ -150,8 +150,9 @@
 	aid_t req = async_send_0(exch, TASKMAN_I_AM_NS, NULL);
 
-	errno_t rc = async_connect_to_me(exch, INTERFACE_NS, 0, 0);
+	errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, 0, 0);
 	taskman_exchange_end(exch);
 
 	if (rc != EOK) {
+		async_forget(req);
 		return rc;
 	}
Index: uspace/lib/c/include/ipc/common.h
===================================================================
--- uspace/lib/c/include/ipc/common.h	(revision 5be636105b3cdb8ad0eb0aaa7fa4fdda0d6c9413)
+++ uspace/lib/c/include/ipc/common.h	(revision 7ffdcbd812712c8d7655c0e0838d5cbaa7aeb11f)
@@ -40,6 +40,5 @@
 
 /* Well known phone descriptors */
-#define PHONE_INITIAL  0
-
+static cap_phone_handle_t const PHONE_INITIAL = (cap_phone_handle_t) (CAP_NIL + 1);
 #define IPC_FLAG_BLOCKING   0x01
 
