diff --git a/bin/rndc/rndc-confgen.c b/bin/rndc/rndc-confgen.c
index 3decc90233..25dc20c6ce 100644
--- a/bin/rndc/rndc-confgen.c
+++ b/bin/rndc/rndc-confgen.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc-confgen.c,v 1.10 2001/09/05 22:32:06 bwelling Exp $ */
+/* $Id: rndc-confgen.c,v 1.11 2001/09/06 23:14:37 gson Exp $ */
 
 #include <config.h>
 
@@ -180,7 +180,7 @@ main(int argc, char **argv) {
 			keyname = isc_commandline_argument;
 			break;
 		case 'M':
-			isc_mem_debugging = 1;
+			isc_mem_debugging = ISC_MEM_DEBUGTRACE;
 			break;
 
 		case 'm':
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 8e2882d0ee..b91cdc27ba 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.77 2001/08/06 11:40:46 gson Exp $ */
+/* $Id: rndc.c,v 1.78 2001/09/06 23:14:38 gson Exp $ */
 
 /*
  * Principal Author: DCL
@@ -498,7 +498,7 @@ main(int argc, char **argv) {
 			break;
 
 		case 'M':
-			isc_mem_debugging = 1;
+			isc_mem_debugging = ISC_MEM_DEBUGTRACE;
 			break;
 
 		case 'm':
diff --git a/bin/tests/mempool_test.c b/bin/tests/mempool_test.c
index 23465398a4..37341c223a 100644
--- a/bin/tests/mempool_test.c
+++ b/bin/tests/mempool_test.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mempool_test.c,v 1.12 2001/01/09 21:41:19 bwelling Exp $ */
+/* $Id: mempool_test.c,v 1.13 2001/09/06 23:14:39 gson Exp $ */
 
 #include <config.h>
 
@@ -36,7 +36,7 @@ main(int argc, char *argv[]) {
 	UNUSED(argc);
 	UNUSED(argv);
 
-	isc_mem_debugging = 2;
+	isc_mem_debugging = ISC_MEM_DEBUGRECORD;
 
 	RUNTIME_CHECK(isc_mutex_init(&lock) == ISC_R_SUCCESS);
 
diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c
index 7639accb98..2374231aff 100644
--- a/bin/tests/rbt_test.c
+++ b/bin/tests/rbt_test.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt_test.c,v 1.42 2001/01/09 21:41:32 bwelling Exp $ */
+/* $Id: rbt_test.c,v 1.43 2001/09/06 23:14:40 gson Exp $ */
 
 #include <config.h>
 
@@ -292,7 +292,7 @@ main(int argc, char **argv) {
 	/*
 	 * So isc_mem_stats() can report any allocation leaks.
 	 */
-	isc_mem_debugging = 2;
+	isc_mem_debugging = ISC_MEM_DEBUGRECORD;
 
 	result = isc_mem_create(0, 0, &mctx);
 	if (result != ISC_R_SUCCESS) {
diff --git a/bin/tests/system/stress/ns1/root.db b/bin/tests/system/stress/ns1/root.db
index 0eda45e1e4..66f9b345ee 100644
--- a/bin/tests/system/stress/ns1/root.db
+++ b/bin/tests/system/stress/ns1/root.db
@@ -1,20 +1,3 @@
-; Copyright (C) 2000, 2001  Internet Software Consortium.
-;
-; Permission to use, copy, modify, and distribute this software for any
-; purpose with or without fee is hereby granted, provided that the above
-; copyright notice and this permission notice appear in all copies.
-;
-; THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
-; DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-; INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-; FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-; $Id: root.db,v 1.2 2001/01/09 21:44:49 bwelling Exp $
-
  300
 .                       IN SOA  gson.nominum.com. a.root.servers.nil. (
 								       2000042100      ; serial