diff --git a/doc/Changelog b/doc/Changelog
index a5cbfe1a4..cbb08f488 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+30 September 2016: Wouter
+	- Fix Nits for 1.5.10 reported by Dag-Erling Smorgrav.
+
 29 September 2016: Wouter
 	- Fix #838: 1.5.10 cannot be built on Solaris, undefined PATH_MAX.
 	- Fix #839: Memory grows unexpectedly with large RPZ files.
diff --git a/services/localzone.c b/services/localzone.c
index 01070f239..31645224a 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -1411,7 +1411,7 @@ lz_inform_print(struct local_zone* z, struct query_info* qinfo,
 	log_nametypeclass(0, txt, qinfo->qname, qinfo->qtype, qinfo->qclass);
 }
 
-enum localzone_type
+static enum localzone_type
 lz_type(uint8_t *taglist, size_t taglen, uint8_t *taglist2, size_t taglen2,
 	uint8_t *tagactions, size_t tagactionssize, enum localzone_type lzt,
 	struct comm_reply* repinfo, struct rbtree_t* override_tree, int* tag,
diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index 00ab5e2ae..68e8e405f 100644
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -420,7 +420,7 @@ read_builtin_cert(void)
 {
 	const char* builtin_cert = get_builtin_cert();
 	STACK_OF(X509)* sk;
-	BIO *bio = BIO_new_mem_buf((void*)builtin_cert,
+	BIO *bio = BIO_new_mem_buf(builtin_cert,
 		(int)strlen(builtin_cert));
 	if(!bio) {
 		if(verb) printf("out of memory\n");
diff --git a/smallapp/worker_cb.c b/smallapp/worker_cb.c
index 6ed95ac01..fd8488a38 100644
--- a/smallapp/worker_cb.c
+++ b/smallapp/worker_cb.c
@@ -225,8 +225,8 @@ struct order_id {
 
 int order_lock_cmp(const void* e1, const void* e2)
 {
-        struct order_id* o1 = (struct order_id*)e1;
-        struct order_id* o2 = (struct order_id*)e2;
+        const struct order_id* o1 = e1;
+        const struct order_id* o2 = e2;
         if(o1->thr < o2->thr) return -1;
         if(o1->thr > o2->thr) return 1;
         if(o1->instance < o2->instance) return -1;
@@ -237,7 +237,7 @@ int order_lock_cmp(const void* e1, const void* e2)
 int
 codeline_cmp(const void* a, const void* b)
 {
-        return strcmp((const char*)a, (const char*)b);
+        return strcmp(a, b);
 }
 
 int replay_var_compare(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b))