2 files changed, 4 insertions, 3 deletions

diff --git a/contrib/scripts/zonewalk-to-types.sh b/contrib/scripts/zonewalk-to-types.sh
index c453702e6..54c887b8f 100755
--- a/contrib/scripts/zonewalk-to-types.sh
+++ b/contrib/scripts/zonewalk-to-types.sh
@@ -12,8 +12,8 @@ NUM_CLIENTS=3
 # and then randomize the order.
 cat $1 | awk '{print $1}' | sort | uniq | shuf > $1.tmp
 TOTAL=`cat $1.tmp | wc -l`
-GROUP_SIZE=`expr $TOTAL / \( $NUM_TYPES + 1 \)`
-
+GROUP_SIZE=`expr $TOTAL / \( $NUM_CLIENTS + 1 \)`
+echo "Creating $NUM_CLIENTS benchmark sets with 2x $GROUP_SIZE entries each."
 # First group (0) is to be shared among all clients
 for i in `seq 1 $NUM_CLIENTS`
 do
@@ -21,7 +21,7 @@ do
 done
 
 # Second group (1) is unique per client
-OFF=0
+OFF=$GROUP_SIZE
 for i in `seq 1 $NUM_CLIENTS`
 do
   END=`expr $OFF + $GROUP_SIZE`
diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c
index d5afae9f6..3754eec09 100644
--- a/src/gns/gnunet-gns-benchmark.c
+++ b/src/gns/gnunet-gns-benchmark.c
@@ -244,6 +244,7 @@ process_queue (void *cls)
     duration = GNUNET_TIME_absolute_get_duration (req->op_start_time);
     if (duration.rel_value_us < timeout.rel_value_us)
       break;
+    GNUNET_GNS_lookup_with_tld_cancel (req->lr);
     GNUNET_CONTAINER_DLL_remove (act_head,
                                  act_tail,
                                  req);