diff --git a/src/controller/cluster.c b/src/controller/cluster.c
index 49f021a..8727580 100644
--- a/src/controller/cluster.c
+++ b/src/controller/cluster.c
@@ -285,6 +285,7 @@ static int handle_connection(struct epoll_event* p)
     ep2->iomgr = iomgr;
 
     endpoint_set_owner(ep2, c);
+    endpoint_set_peer(ep2, c->myhost);
     endpoint_set_msg_handler(ep2, (msg_handler_t)handle_msg);
     endpoint_set_err_handler(ep2, (err_handler_t)handle_endpoint_error);
 
diff --git a/src/controller/testsuite/test.c b/src/controller/testsuite/test.c
index 9f6cbeb..059fe45 100644
--- a/src/controller/testsuite/test.c
+++ b/src/controller/testsuite/test.c
@@ -575,7 +575,7 @@ int cmd_workerlist(int argc, char* argv[])
                workers[i]->attrs->maxtmp, workers[i]->attrs->ndisks);
     }
 
-    free(workers);
+    free_Worker_list(rc, workers);
 
     return 0;
 }
diff --git a/src/lib/netio.c b/src/lib/netio.c
index fb8f184..558647e 100644
--- a/src/lib/netio.c
+++ b/src/lib/netio.c
@@ -414,7 +414,7 @@ static int handle_output(endpoint_t* ep)
 
 static int handle_error(endpoint_t* ep)
 {
-    iomgr_t* iomgr = (iomgr_t*)ep->owner;
+    iomgr_t* iomgr = (iomgr_t*)ep->iomgr;
 
     if (iomgr != NULL) {
         iomgr_unmonitor(iomgr, ep);
diff --git a/src/lib/request.c b/src/lib/request.c
index 47422ca..aa9a2c9 100644
--- a/src/lib/request.c
+++ b/src/lib/request.c
@@ -11,6 +11,11 @@
 #include "utils.h"
 #include "xce/types.h"
 
+#define REQUEST_FROM(req)                                                      \
+    ((req)->from == NULL)                                                      \
+        ? "Unknown"                                                            \
+        : (((req)->from->name == NULL) ? "Unknown" : (req->from->name))
+
 int xce_encode(xce_request_t* req, io_packet_t* pkt)
 {
     struct capn          c;
@@ -19,7 +24,8 @@ int xce_encode(xce_request_t* req, io_packet_t* pkt)
     Request_ptr          rp;
     int                  rc;
 
-    TRACE("%s request op %d seq %ld", __func__, req->opcode, req->seq);
+    TRACE("%s request op %d seq %ld from %s", __func__, req->opcode, req->seq,
+          REQUEST_FROM(req));
 
     capn_init_malloc(&c);
     cs = capn_root(&c).seg;
@@ -58,7 +64,8 @@ int xce_decode(io_packet_t* pkt, xce_request_t* req)
 
     decode_Request(req, &rq);
 
-    TRACE("%s request opcode %d seq %ld", __func__, req->opcode, req->seq);
+    TRACE("%s request op %d seq %ld from %s", __func__, req->opcode, req->seq,
+          REQUEST_FROM(req));
     capn_free(&c);
 
     free_packet(pkt);