Index: uspace/srv/taskman/main.c
===================================================================
--- uspace/srv/taskman/main.c	(revision 16d748ee929fdcbdaa98b949e62bf93baf2ddd32)
+++ uspace/srv/taskman/main.c	(revision 856b75b75ee31b41fd4780b482b1d8e9e25a3564)
@@ -72,5 +72,5 @@
 static void connect_to_loader(ipc_call_t *icall)
 {
-	DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
+	DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
 	/*
 	 * We don't accept the connection request, we forward it instead to
@@ -110,5 +110,5 @@
 static void connect_to_ns(ipc_call_t *icall)
 {
-	DPRINTF("%s, %llu\n", __func__, icall->task_id);
+	DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
 
 	/* Wait until we know NS */
@@ -130,4 +130,5 @@
 static void taskman_new_task(ipc_call_t *icall)
 {
+	DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
 	errno_t rc = task_intro(icall->task_id);
 	if (rc == EOK) {
@@ -140,5 +141,5 @@
 static void taskman_i_am_ns(ipc_call_t *icall)
 {
-	DPRINTF("%s, %llu\n", __func__, icall->task_id);
+	DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
 	errno_t rc = EOK;
 
@@ -184,5 +185,5 @@
 	bool wait_for_exit = ipc_get_arg2(icall);
 
-	DPRINTF("%s:%i from %llu/%i\n", __func__, __LINE__, sender, retval);
+	DPRINTF("%s:%d from %" PRIu64 "/%i\n", __func__, __LINE__, sender, retval);
 
 	errno_t rc = task_set_retval(sender, retval, wait_for_exit);
@@ -192,5 +193,5 @@
 static void taskman_ctl_ev_callback(ipc_call_t *icall)
 {
-	DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
+	DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
 
 	bool past_events = ipc_get_arg1(icall);
@@ -210,5 +211,5 @@
 	task_id_t id = MERGE_LOUP32(ipc_get_arg1(icall), ipc_get_arg2(icall));
 	exit_reason_t exit_reason = ipc_get_arg3(icall);
-	DPRINTF("%s:%i from %llu/%i\n", __func__, __LINE__, id, exit_reason);
+	DPRINTF("%s:%d from %" PRIu64 "/%i\n", __func__, __LINE__, id, exit_reason);
 	task_terminated(id, exit_reason);
 }
@@ -217,5 +218,5 @@
 {
 	task_id_t id = MERGE_LOUP32(ipc_get_arg1(icall), ipc_get_arg2(icall));
-	DPRINTF("%s:%i from %llu\n", __func__, __LINE__, id);
+	DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, id);
 	task_failed(id);
 }
@@ -223,5 +224,5 @@
 static void loader_callback(ipc_call_t *icall)
 {
-	DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
+	DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, icall->task_id);
 	// TODO check that loader is expected, would probably discard prodcons
 	//      scheme
@@ -262,4 +263,8 @@
 			return;
 		default:
+			DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
+			    __func__, __LINE__,
+			    icall->task_id, ipc_get_imethod(icall),
+			    ipc_get_arg1(icall), ipc_get_arg2(icall));
 			async_answer_0(icall, ENOTSUP);
 			return;
@@ -271,4 +276,8 @@
 			return;
 		default:
+			DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
+			    __func__, __LINE__,
+			    icall->task_id, ipc_get_imethod(icall),
+			    ipc_get_arg1(icall), ipc_get_arg2(icall));
 			async_answer_0(icall, ENOTSUP);
 			return;
@@ -282,4 +291,5 @@
 		if (!async_get_call(&call)) {
 			/* Client disconnected */
+			DPRINTF("%s:%d client disconnected\n", __func__, __LINE__);
 			return;
 		}
@@ -299,4 +309,8 @@
 			break;
 		default:
+			DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
+			    __func__, __LINE__,
+			    call.task_id, ipc_get_imethod(&call),
+			    ipc_get_arg1(&call), ipc_get_arg2(&call));
 			async_answer_0(&call, ENOTSUP);
 		}
Index: uspace/srv/taskman/task.c
===================================================================
--- uspace/srv/taskman/task.c	(revision 16d748ee929fdcbdaa98b949e62bf93baf2ddd32)
+++ uspace/srv/taskman/task.c	(revision 856b75b75ee31b41fd4780b482b1d8e9e25a3564)
@@ -216,5 +216,5 @@
 
 	hash_table_insert(&task_hash_table, &t->link);
-	DPRINTF("%s: %llu\n", __func__, t->id);
+	DPRINTF("%s:%d from %" PRIu64 "\n", __func__, __LINE__, t->id);
 
 finish: