diff --git a/src/dict.h b/src/dict.h
index 0a74cc14..65c3958f 100644
--- a/src/dict.h
+++ b/src/dict.h
@@ -70,7 +70,7 @@ struct getdns_dict
 	struct mem_funcs mf;
 };
 
-inline struct getdns_dict *_getdns_dict_create_with_mf(struct mem_funcs *mf)
+inline static getdns_dict *_getdns_dict_create_with_mf(struct mem_funcs *mf)
 { return getdns_dict_create_with_extended_memory_functions(
          mf->mf_arg, mf->mf.ext.malloc, mf->mf.ext.realloc, mf->mf.ext.free); }
 
diff --git a/src/dnssec.c b/src/dnssec.c
index 034c35cd..929949e9 100644
--- a/src/dnssec.c
+++ b/src/dnssec.c
@@ -1329,10 +1329,10 @@ static ldns_rr *rr2ldns_rr(priv_getdns_rr_iter *rr)
 	size_t pos = rr->pos - rr->pkt;
 
 	if (ldns_wire2rr(&rr_l, rr->pkt, rr->pkt_end - rr->pkt, &pos,
-			priv_getdns_rr_iter_section(rr)) == LDNS_STATUS_OK)
-		return rr_l;
-	else
+			(ldns_pkt_section)priv_getdns_rr_iter_section(rr)))
 		return NULL;
+	else
+		return rr_l;
 }
 
 static ldns_rr_list *rrset2ldns_rr_list(getdns_rrset *rrset)
@@ -2685,6 +2685,9 @@ static void check_chain_complete(chain_head *chain)
 
 				dns_req_free(node->ds_req->owner);
 			}
+			if (node->soa_req) {
+				dns_req_free(node->soa_req->owner);
+			}
 		}
 		GETDNS_FREE(head->my_mf, head);
 	}
diff --git a/src/general.c b/src/general.c
index 8340e5f9..8e419069 100644
--- a/src/general.c
+++ b/src/general.c
@@ -347,38 +347,38 @@ priv_getdns_hostname_loop(getdns_context *context, getdns_eventloop *loop,
 		    "%hhx.%hhx.%hhx.%hhx.%hhx.%hhx.%hhx.%hhx."
 		    "%hhx.%hhx.%hhx.%hhx.%hhx.%hhx.%hhx.%hhx."
 		    "%hhx.%hhx.%hhx.%hhx.%hhx.%hhx.%hhx.%hhx.ip6.arpa.",
-		    ((uint8_t *)address_data->data)[15] & 0x0F,
-		    ((uint8_t *)address_data->data)[15] >> 4,
-		    ((uint8_t *)address_data->data)[14] & 0x0F,
-		    ((uint8_t *)address_data->data)[14] >> 4,
-		    ((uint8_t *)address_data->data)[13] & 0x0F,
-		    ((uint8_t *)address_data->data)[13] >> 4,
-		    ((uint8_t *)address_data->data)[12] & 0x0F,
-		    ((uint8_t *)address_data->data)[12] >> 4,
-		    ((uint8_t *)address_data->data)[11] & 0x0F,
-		    ((uint8_t *)address_data->data)[11] >> 4,
-		    ((uint8_t *)address_data->data)[10] & 0x0F,
-		    ((uint8_t *)address_data->data)[10] >> 4,
-		    ((uint8_t *)address_data->data)[9] & 0x0F,
-		    ((uint8_t *)address_data->data)[9] >> 4,
-		    ((uint8_t *)address_data->data)[8] & 0x0F,
-		    ((uint8_t *)address_data->data)[8] >> 4,
-		    ((uint8_t *)address_data->data)[7] & 0x0F,
-		    ((uint8_t *)address_data->data)[7] >> 4,
-		    ((uint8_t *)address_data->data)[6] & 0x0F,
-		    ((uint8_t *)address_data->data)[6] >> 4,
-		    ((uint8_t *)address_data->data)[5] & 0x0F,
-		    ((uint8_t *)address_data->data)[5] >> 4,
-		    ((uint8_t *)address_data->data)[4] & 0x0F,
-		    ((uint8_t *)address_data->data)[4] >> 4,
-		    ((uint8_t *)address_data->data)[3] & 0x0F,
-		    ((uint8_t *)address_data->data)[3] >> 4,
-		    ((uint8_t *)address_data->data)[2] & 0x0F,
-		    ((uint8_t *)address_data->data)[2] >> 4,
-		    ((uint8_t *)address_data->data)[1] & 0x0F,
-		    ((uint8_t *)address_data->data)[1] >> 4,
-		    ((uint8_t *)address_data->data)[0] & 0x0F,
-		    ((uint8_t *)address_data->data)[0] >> 4);
+		    (uint8_t)(((uint8_t *)address_data->data)[15] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[15] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[14] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[14] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[13] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[13] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[12] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[12] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[11] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[11] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[10] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[10] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[9] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[9] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[8] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[8] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[7] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[7] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[6] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[6] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[5] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[5] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[4] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[4] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[3] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[3] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[2] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[2] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[1] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[1] >> 4),
+		    (uint8_t)(((uint8_t *)address_data->data)[0] & 0x0F),
+		    (uint8_t)(((uint8_t *)address_data->data)[0] >> 4));
 		break;
 	default:
 		return GETDNS_RETURN_INVALID_PARAMETER;
diff --git a/src/list.h b/src/list.h
index 113361ae..6d31d932 100644
--- a/src/list.h
+++ b/src/list.h
@@ -74,7 +74,7 @@ struct getdns_list
 	struct mem_funcs mf;
 };
 
-inline struct getdns_list *_getdns_list_create_with_mf(struct mem_funcs *mf)
+inline static getdns_list *_getdns_list_create_with_mf(struct mem_funcs *mf)
 { return getdns_list_create_with_extended_memory_functions(
          mf->mf_arg, mf->mf.ext.malloc, mf->mf.ext.realloc, mf->mf.ext.free); }
 
diff --git a/src/test/getdns_query.c b/src/test/getdns_query.c
index 130fa3c7..1e30abff 100644
--- a/src/test/getdns_query.c
+++ b/src/test/getdns_query.c
@@ -190,7 +190,7 @@ static getdns_return_t validate_chain(getdns_dict *response)
 	    response, "replies_tree", &replies_tree)))
 		goto error;
 
-	fprintf(stdout, "replies_tree %zu, dnssec_status: ", i);
+	fprintf(stdout, "replies_tree dnssec_status: ");
 	switch ((s = getdns_validate_dnssec(
 	    replies_tree, validation_chain, trust_anchor))) {
 
diff --git a/src/util-internal.c b/src/util-internal.c
index 9dd5053d..52c715b6 100644
--- a/src/util-internal.c
+++ b/src/util-internal.c
@@ -736,7 +736,7 @@ create_getdns_response(getdns_dns_req *completed_request)
 		nreplies++;
 		if (netreq->dnssec_status == GETDNS_DNSSEC_SECURE)
 			nsecure++;
-		else if (! netreq->dnssec_status != GETDNS_DNSSEC_BOGUS)
+		else if (netreq->dnssec_status != GETDNS_DNSSEC_BOGUS)
 			ninsecure++;
 
 		if (dnssec_return_status &&