diff --git a/src/context.c b/src/context.c
index 7cf844ea..ce6b2c89 100644
--- a/src/context.c
+++ b/src/context.c
@@ -673,7 +673,6 @@ set_os_defaults(struct getdns_context *context)
 			upstream_count++;
 	fclose(in);
 
-	fprintf(stderr, "%d\n", (int)upstream_count);
 	context->suffix = getdns_list_create_with_context(context);
 	context->upstreams = upstreams_create(
 	    context, upstream_count * GETDNS_UPSTREAM_TRANSPORTS);
diff --git a/src/dnssec.c b/src/dnssec.c
index db0b7caa..c8bfd938 100644
--- a/src/dnssec.c
+++ b/src/dnssec.c
@@ -1110,11 +1110,15 @@ static void add_question2val_chain(struct mem_funcs *mf,
 
 static getdns_dict *CD_extension(getdns_dns_req *dnsreq)
 {
+#ifdef DNSSEC_ROADBLOCK_AVOIDANCE
 	return !dnsreq->dnssec_roadblock_avoidance
 	     ? dnssec_ok_checking_disabled
 	     : !dnsreq->avoid_dnssec_roadblocks
 	     ? dnssec_ok_checking_disabled_roadblock_avoidance
 	     : dnssec_ok_checking_disabled_avoid_roadblocks;
+#else
+	return dnssec_ok_checking_disabled;
+#endif
 }
 
 static void check_chain_complete(chain_head *chain);