diff --git a/src/EventHandler.h b/src/EventHandler.h
index ed981ae7e4..f47ff173d8 100644
--- a/src/EventHandler.h
+++ b/src/EventHandler.h
@@ -20,7 +20,7 @@ class EventHandler
 public:
 	explicit EventHandler(std::string name);
 
-	const char* Name() { return name.data(); }
+	const char* Name() const { return name.data(); }
 
 	const FuncPtr& GetFunc() { return local; }
 
diff --git a/src/analyzer/Analyzer.h b/src/analyzer/Analyzer.h
index 6d56fa129a..942893a79c 100644
--- a/src/analyzer/Analyzer.h
+++ b/src/analyzer/Analyzer.h
@@ -605,6 +605,8 @@ public:
 	 * use this method to attach additional data to the connections. A
 	 * call to BuildConnVal() will in turn trigger a call to
 	 * UpdateConnVal().
+	 * ### The above comment needs updating, there's no BuildConnVal()
+	 * ### anymore -VP
 	 *
 	 * @param conn_val The connenction value being updated.
 	 */
diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index 2ae69ca061..b28397693c 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -281,13 +281,13 @@ static void done_with_network()
 	ZEEK_LSAN_DISABLE();
 	}
 
-static void terminate_bro()
+static void terminate_zeek()
 	{
-	util::detail::set_processing_status("TERMINATING", "terminate_bro");
+	util::detail::set_processing_status("TERMINATING", "terminate_zeek");
 
 	run_state::terminating = true;
 
-	iosource_mgr->Wakeup("terminate_bro");
+	iosource_mgr->Wakeup("terminate_zeek");
 
 	// File analysis termination may produce events, so do it early on in
 	// the termination process.
@@ -943,7 +943,7 @@ int cleanup(bool did_run_loop)
 		done_with_network();
 
 	run_state::detail::delete_run();
-	terminate_bro();
+	terminate_zeek();
 
 	sqlite3_shutdown();
 
@@ -974,7 +974,7 @@ void zeek_terminate_loop(const char* reason)
 	zeek::detail::done_with_network();
 	delete_run();
 
-	zeek::detail::terminate_bro();
+	zeek::detail::terminate_zeek();
 
 	// Close files after net_delete(), because net_delete()
 	// might write to connection content files.