diff --git a/src/Event.cc b/src/Event.cc
index 0ae98f8fab..8759eeed74 100644
--- a/src/Event.cc
+++ b/src/Event.cc
@@ -15,7 +15,6 @@
 #include "zeek/plugin/Manager.h"
 
 zeek::EventMgr zeek::event_mgr;
-zeek::EventMgr& mgr = zeek::event_mgr;
 
 namespace zeek
 	{
diff --git a/src/EventHandler.h b/src/EventHandler.h
index f47ff173d8..64f134786e 100644
--- a/src/EventHandler.h
+++ b/src/EventHandler.h
@@ -22,7 +22,7 @@ public:
 
 	const char* Name() const { return name.data(); }
 
-	const FuncPtr& GetFunc() { return local; }
+	const FuncPtr& GetFunc() const { return local; }
 
 	const FuncTypePtr& GetType(bool check_export = true);
 
diff --git a/src/script_opt/UseDefs.cc b/src/script_opt/UseDefs.cc
index 21ebb59548..e80f38f6a3 100644
--- a/src/script_opt/UseDefs.cc
+++ b/src/script_opt/UseDefs.cc
@@ -124,11 +124,11 @@ bool UseDefs::RemoveUnused(int iter)
 		// Because we're dealing with reduced statements, the
 		// assignment expression should be to a simple variable.
 		if ( r->Tag() != EXPR_REF )
-			reporter->InternalError("lhs ref inconsistency in UseDefs::FindUnused");
+			reporter->InternalError("lhs ref inconsistency in UseDefs::RemoveUnused");
 
 		auto n = r->AsRefExprPtr()->GetOp1();
 		if ( n->Tag() != EXPR_NAME )
-			reporter->InternalError("lhs name inconsistency in UseDefs::FindUnused");
+			reporter->InternalError("lhs name inconsistency in UseDefs::RemoveUnused");
 
 		auto id = n->AsNameExpr()->Id();