diff --git a/scripts/rr-client b/scripts/rr-client
index 1dab393..14aac80 100755
--- a/scripts/rr-client
+++ b/scripts/rr-client
@@ -3,7 +3,7 @@ mkdir -p ./log
 tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log &
 sleep 2
 mkdir -p ./shared
-donar -a rr -b -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log &
+valgrind --leak-check=full donar -a rr -b -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log &
 sleep 2
 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections
-measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/rr.csv 2> ./log/client-measlat-stderr.log
+valgrind --leak-check=full measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/rr.csv 2> ./log/client-measlat-stderr.log
diff --git a/scripts/rr-server b/scripts/rr-server
index b7ceb86..d2c6236 100755
--- a/scripts/rr-server
+++ b/scripts/rr-server
@@ -5,5 +5,5 @@ sleep 2
 mkdir -p ./shared
 cd ./shared
 pwd
-donar -a rr -b -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
-udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log
+valgrind --leak-check=full donar -a rr -b -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
+valgrind --leak-check=full udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log
diff --git a/src/evt_core.c b/src/evt_core.c
index 0309363..f1b330a 100644
--- a/src/evt_core.c
+++ b/src/evt_core.c
@@ -145,7 +145,7 @@ struct evt_core_cat* evt_core_rm_fd(struct evt_core_ctx* ctx, int fd) {
   struct evt_core_fdinfo* fdinfo = g_hash_table_lookup (ctx->socklist, &fd);
   if (fdinfo == NULL) return NULL;
   cat = fdinfo->cat;
-  if (ctx->verbose) fprintf(stderr, "  Closing fd=%d from cat=%s\n",fdinfo->fd, fdinfo->cat->name);
+  if (ctx->verbose) fprintf(stderr, "  Closing url=%s, fd=%d from cat=%s\n", fdinfo->url, fdinfo->fd, fdinfo->cat->name);
 
   // 2. Update category
   for (int i = 0; i < cat->socklist->len; i++) {