diff -r c5d121fd35c0 tools/blktap/drivers/tapaio.c
--- a/tools/blktap/drivers/tapaio.c	Mon Feb 28 16:55:20 2011 +0000
+++ b/tools/blktap/drivers/tapaio.c	Wed Mar 02 13:13:15 2011 +0100
@@ -223,7 +223,7 @@
 				"trying to concurrently use a large number "
 				"of blktap-based disks, you may need to "
 				"increase the system-wide aio request limit. "
-				"(e.g. 'echo echo 1048576 > /proc/sys/fs/"
+				"(e.g. 'echo 1048576 > /proc/sys/fs/"
 				"aio-max-nr')\n");
 		} else {
 			DPRINTF("Couldn't setup AIO context.\n");
diff -r c5d121fd35c0 tools/blktap/lib/blktaplib.h
--- a/tools/blktap/lib/blktaplib.h	Mon Feb 28 16:55:20 2011 +0000
+++ b/tools/blktap/lib/blktaplib.h	Wed Mar 02 13:13:15 2011 +0100
@@ -226,7 +226,7 @@
 
 
 /* Abitrary values, must match the underlying driver... */
-#define MAX_TAP_DEV 100
+#define MAX_TAP_DEV 256
 
 /* Accessing attached data page mappings */
 #define MMAP_PAGES                                              \
diff -r c5d121fd35c0 tools/xenstore/xenstored_core.c
--- a/tools/xenstore/xenstored_core.c	Mon Feb 28 16:55:20 2011 +0000
+++ b/tools/xenstore/xenstored_core.c	Wed Mar 02 13:13:15 2011 +0100
@@ -75,10 +75,10 @@
 	} while (0)
 
 
-int quota_nb_entry_per_domain = 1000;
-int quota_nb_watch_per_domain = 128;
-int quota_max_entry_size = 2048; /* 2K */
-int quota_max_transaction = 10;
+int quota_nb_entry_per_domain = 4000;
+int quota_nb_watch_per_domain = 512;
+int quota_max_entry_size = 8192; /* 8K */
+int quota_max_transaction = 40;
 
 TDB_CONTEXT *tdb_context(struct connection *conn)
 {
@@ -1719,7 +1719,7 @@
 "  --trace-file <file> giving the file for logging, and\n"
 "  --entry-nb <nb>     limit the number of entries per domain,\n"
 "  --entry-size <size> limit the size of entry per domain, and\n"
-"  --entry-watch <nb>  limit the number of watches per domain,\n"
+"  --watch-nb <nb>     limit the number of watches per domain,\n"
 "  --transaction <nb>  limit the number of transaction allowed per domain,\n"
 "  --no-recovery       to request that no recovery should be attempted when\n"
 "                      the store is corrupted (debug only),\n"