diff --git a/doc/Changelog b/doc/Changelog
index 3463096b8..10e05fdbe 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -10,6 +10,10 @@
 	- Free memory leak in config strlist append.
 	- make sure nsec3 comparison salt is initialized.
 	- unit test has clang analysis.
+	- remove unused variable assignment from iterator scrub routine.
+	- check for null in delegation point during iterator refetch
+	  in forward zone.
+	- neater pointer cast in libunbound context quit routine.
 
 11 September 2018: Wouter
 	- Fixed unused return value warnings in contrib/fastrpz.patch for
diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
index 12580dcdb..b354eaa28 100644
--- a/iterator/iter_scrub.c
+++ b/iterator/iter_scrub.c
@@ -437,7 +437,9 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,
 					rrset->rrset_all_next =
 						nx->rrset_all_next;
 					nx->rrset_all_next = rrset;
-					prev = nx;
+					/* prev = nx; unused, enable if there
+					 * is other rrset removal code after
+					 * this */
 				}
 			}
 
diff --git a/iterator/iterator.c b/iterator/iterator.c
index 7f17a9986..bfee82c23 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1125,7 +1125,7 @@ forward_request(struct module_qstate* qstate, struct iter_qstate* iq)
 	struct delegpt* dp;
 	uint8_t* delname = iq->qchase.qname;
 	size_t delnamelen = iq->qchase.qname_len;
-	if(iq->refetch_glue) {
+	if(iq->refetch_glue && iq->dp) {
 		delname = iq->dp->name;
 		delnamelen = iq->dp->namelen;
 	}
diff --git a/libunbound/context.c b/libunbound/context.c
index 9a35ce56f..20e3680ec 100644
--- a/libunbound/context.c
+++ b/libunbound/context.c
@@ -392,12 +392,12 @@ struct ctx_query* context_deserialize_cancel(struct ub_ctx* ctx,
 uint8_t* 
 context_serialize_quit(uint32_t* len)
 {
-	uint8_t* p = (uint8_t*)malloc(sizeof(uint32_t));
+	uint32_t* p = (uint32_t*)malloc(sizeof(uint32_t));
 	if(!p)
 		return NULL;
 	*len = sizeof(uint32_t);
 	sldns_write_uint32(p, UB_LIBCMD_QUIT);
-	return p;
+	return (uint8_t*)p;
 }
 
 enum ub_ctx_cmd context_serial_getcmd(uint8_t* p, uint32_t len)