diff --git a/dnsbl.c b/dnsbl.c
index 51abf91..8d79c55 100644
--- a/dnsbl.c
+++ b/dnsbl.c
@@ -444,6 +444,7 @@ static int dnsbl_config_handler(mowgli_config_file_entry_t *ce)
 	{
 		char *line = sstrdup(cce->varname);
 		new_blacklist(line);
+		free(line);
 	}
 
 	return 0;
diff --git a/gen_echoserver.c b/gen_echoserver.c
index 74d7ed2..88c873d 100644
--- a/gen_echoserver.c
+++ b/gen_echoserver.c
@@ -58,9 +58,9 @@ static void my_rhandler(connection_t * cptr)
 {
         char buf[BUFSIZE * 2];
 
-        if (!my_read(cptr, buf))
+        if (my_read(cptr, buf) <= 0)
 		connection_close(cptr);
-
+	else
         do_packet(cptr, buf);
 }
 
diff --git a/gen_listenerdemo.c b/gen_listenerdemo.c
index 7305524..dd8414b 100644
--- a/gen_listenerdemo.c
+++ b/gen_listenerdemo.c
@@ -62,9 +62,9 @@ static void my_rhandler(connection_t * cptr)
 {
         char buf[BUFSIZE * 2];
 
-        if (!my_read(cptr, buf))
+        if (my_read(cptr, buf) <= 0)
 		connection_close(cptr);
-
+	else
         do_packet(buf);
 }
 
diff --git a/os_trace.c b/os_trace.c
index 874ce38..7763503 100644
--- a/os_trace.c
+++ b/os_trace.c
@@ -579,7 +579,7 @@ static void trace_kill_exec(user_t *u, trace_action_t *act)
 		return;
 	if (u->myuser && is_soper(u->myuser))
 		return;
-	if ((svs = service_find("operserv")) != NULL)
+	if ((svs = service_find("operserv")) == NULL)
 		return;
 
 	act->matched = true;
diff --git a/wumpus.c b/wumpus.c
index 8c3c21c..eecfb7f 100644
--- a/wumpus.c
+++ b/wumpus.c
@@ -630,9 +630,11 @@ move_wumpus(void *unused)
 			/* player_t *p has been eaten and is no longer in the game */
 			resign_player(p);
 		}
-
-		/* prepare for the next turn */
-		p->has_moved = false;
+		else
+		{
+			/* prepare for the next turn */
+			p->has_moved = false;
+		}
 	}
 
 	/* report any wumpus kills */