diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 6edb96e8e4..a915ec1e4a 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -492,13 +492,13 @@ cleanup:
  */
 static void
 add_opt(dns_message_t *msg, isc_uint16_t udpsize, isc_uint16_t edns,
-	unsigned int flags, dns_ednsopt_t *ednsopts, size_t count)
+	unsigned int flags, dns_ednsopt_t *opts, size_t count)
 {
 	dns_rdataset_t *rdataset = NULL;
 	isc_result_t result;
 
 	result = dns_message_buildopt(msg, &rdataset, edns, udpsize, flags,
-				      ednsopts, count);
+				      opts, count);
 	CHECK("dns_message_buildopt", result);
 	result = dns_message_setopt(msg, rdataset);
 	CHECK("dns_message_setopt", result);
diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 075644fa57..d92296742e 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 /*! \file */
 
 #include <config.h>
@@ -1410,7 +1408,7 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) {
 	source->private5 = tempdb;
 }
 
-static dns_rdatasetmethods_t methods = {
+static dns_rdatasetmethods_t sdb_rdataset_methods = {
 	disassociate,
 	isc__rdatalist_first,
 	isc__rdatalist_next,
@@ -1445,7 +1443,7 @@ list_tordataset(dns_rdatalist_t *rdatalist,
 	RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset) ==
 		      ISC_R_SUCCESS);
 
-	rdataset->methods = &methods;
+	rdataset->methods = &sdb_rdataset_methods;
 	dns_db_attachnode(db, node, &rdataset->private5);
 }