diff '--unified=5' -r libmemcached-1.0.16/clients/generator.cc libmemcached-1.0.16-fixed/clients/generator.cc
--- libmemcached-1.0.16/clients/generator.cc	2013-01-04 03:22:12.000000000 -0500
+++ libmemcached-1.0.16-fixed/clients/generator.cc	2013-02-15 15:04:08.670680318 -0500
@@ -20,10 +20,12 @@
 #include <iostream>
 #include <unistd.h>
 
 #include "clients/generator.h"
 
+#define KEY_BYTES 20
+
 /* Use this for string generation */
 static const char ALPHANUMERICS[]=
   "0123456789ABCDEFGHIJKLMNOPQRSTWXYZabcdefghijklmnopqrstuvwxyz";
 
 #define ALPHANUMERICS_SIZE (sizeof(ALPHANUMERICS)-1)
@@ -73,17 +75,17 @@
     goto error;
   }
 
   for (uint64_t x= 0; x < number_of; x++)
   {
-    pairs[x].key= (char *)calloc(100, sizeof(char));
+    pairs[x].key= (char *)calloc(KEY_BYTES, sizeof(char));
 
     if (pairs[x].key == NULL)
       goto error;
 
-    get_random_string(pairs[x].key, 100);
-    pairs[x].key_length= 100;
+    get_random_string(pairs[x].key, KEY_BYTES);
+    pairs[x].key_length = KEY_BYTES;
 
     if (value_length)
     {
       pairs[x].value= (char *)calloc(value_length, sizeof(char));
 
diff '--unified=5' -r libmemcached-1.0.16/clients/memslap.cc libmemcached-1.0.16-fixed/clients/memslap.cc
--- libmemcached-1.0.16/clients/memslap.cc	2013-01-24 18:03:05.000000000 -0500
+++ libmemcached-1.0.16-fixed/clients/memslap.cc	2013-02-15 15:03:11.649439270 -0500
@@ -64,10 +64,12 @@
 
 #define DEFAULT_INITIAL_LOAD 10000
 #define DEFAULT_EXECUTE_NUMBER 10000
 #define DEFAULT_CONCURRENCY 1
 
+#define VALUE_BYTES 4096
+
 #define PROGRAM_NAME "memslap"
 #define PROGRAM_DESCRIPTION "Generates a load against a memcached custer of servers."
 
 /* Global Thread counter */
 volatile unsigned int master_wakeup;
@@ -328,11 +330,11 @@
     context->keys= keys;
     context->key_lengths= key_lengths;
 
     if (opt_test == SET_TEST)
     {
-      context->execute_pairs= pairs_generate(opt_execute_number, 400);
+      context->execute_pairs= pairs_generate(opt_execute_number, VALUE_BYTES);
       context->execute_number= opt_execute_number;
     }
 
     /* now you create the thread */
     if (pthread_create(threads +x, NULL, run_task, (void *)context) != 0)
@@ -540,11 +542,11 @@
 {
   memcached_st *memc_clone= memcached_clone(NULL, memc);
   /* We always used non-blocking IO for load since it is faster */
   memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
 
-  pairs_st *pairs= pairs_generate(number_of, 400);
+  pairs_st *pairs= pairs_generate(number_of, VALUE_BYTES);
   *actual_loaded= execute_set(memc_clone, pairs, number_of);
 
   memcached_free(memc_clone);
 
   return pairs;