diff --git a/bin/named/server.c b/bin/named/server.c
index 7582b2ea4d..0a5cb21f38 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -14788,7 +14788,7 @@ isc_result_t
 named_server_dnstap(named_server_t *server, isc_lex_t *lex,
 		    isc_buffer_t **text)
 {
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 	char *ptr;
 	isc_result_t result;
 	isc_boolean_t reopen = ISC_FALSE;
diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 7055d269e7..f73eacd32a 100644
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -1600,7 +1600,7 @@ generatexml(named_server_t *server, isc_uint32_t flags,
 	isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max];
 	isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max];
 	isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max];
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 	isc_uint64_t dnstapstat_values[dns_dnstapcounter_max];
 #endif
 	isc_result_t result;
@@ -1723,7 +1723,7 @@ generatexml(named_server_t *server, isc_uint32_t flags,
 			goto error;
 		TRY0(xmlTextWriterEndElement(writer)); /* resstat */
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 		if (server->dtenv != NULL) {
 			isc_stats_t *dnstapstats = NULL;
 			TRY0(xmlTextWriterStartElement(writer,
@@ -2395,7 +2395,7 @@ generatejson(named_server_t *server, size_t *msglen,
 	isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max];
 	isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max];
 	isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max];
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 	isc_uint64_t dnstapstat_values[dns_dnstapcounter_max];
 #endif
 	stats_dumparg_t dumparg;
@@ -2562,7 +2562,7 @@ generatejson(named_server_t *server, size_t *msglen,
 		else
 			json_object_put(counters);
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 		/* dnstap stat counters */
 		if (named_g_server->dtenv != NULL) {
 			isc_stats_t *dnstapstats = NULL;
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 6f0145e80c..3037710e0f 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -894,7 +894,7 @@ typedef struct {
 	unsigned int max;
 } intervaltable;
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 typedef struct {
 	const char *name;
 	unsigned int min;
@@ -978,7 +978,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
 		NULL
 	};
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 	static fstrmtable fstrm[] = {
 		{
 			"fstrm-set-buffer-hint",
@@ -1459,7 +1459,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
 		}
 	}
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 	for (i = 0; i < sizeof(fstrm) / sizeof(fstrm[0]); i++) {
 		isc_uint32_t value;
 
diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 6c937031d7..cd7575d582 100644
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1550,7 +1550,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
 	if (entry->opts.masters.count > 0 &&
 	    entry->opts.masters.dscps[0] >= 0) {
 		isc_buffer_putstr(buffer, " dscp ");
-		snprintf(pbuf, sizeof(pbuf), "%d",
+		snprintf(pbuf, sizeof(pbuf), "%hd",
 			 entry->opts.masters.dscps[0]);
 		isc_buffer_putstr(buffer, pbuf);
 	}