diff --git a/scripts/base/protocols/ssl/main.zeek b/scripts/base/protocols/ssl/main.zeek
index 81a822f29b..38c12f7ab6 100644
--- a/scripts/base/protocols/ssl/main.zeek
+++ b/scripts/base/protocols/ssl/main.zeek
@@ -111,8 +111,8 @@ export {
 	## record as it is sent on to the logging framework.
 	global log_ssl: event(rec: Info);
 
-	# Hook that can be used to perform actions right before the log record
-	# is written.
+	## Hook that can be used to perform actions right before the log record
+	## is written.
 	global ssl_finishing: hook(c: connection);
 
 	## SSL finalization hook.  Remaining SSL info may get logged when it's called.
diff --git a/src/Func.cc b/src/Func.cc
index aa0c87da61..58d8fe6652 100644
--- a/src/Func.cc
+++ b/src/Func.cc
@@ -44,7 +44,7 @@
 #include "zeek/File.h"
 #include "zeek/Frame.h"
 #include "zeek/Var.h"
-#include "zeek/analyzer/protocol/login/Login.h"
+#include "zeek/analyzer/protocol/tcp/TCP.h"
 #include "zeek/session/Manager.h"
 #include "zeek/RE.h"
 #include "zeek/Event.h"
diff --git a/src/script_opt/ProfileFunc.h b/src/script_opt/ProfileFunc.h
index 4fa4adeccd..51b6a2b669 100644
--- a/src/script_opt/ProfileFunc.h
+++ b/src/script_opt/ProfileFunc.h
@@ -396,8 +396,9 @@ protected:
 
 	// Maps script functions to associated profiles.  This isn't
 	// actually well-defined in the case of event handlers and hooks,
-	// which can have multiple bodies.  However, this is only used
-	// in the context of analyzing a single-bodied function.
+	// which can have multiple bodies.  However, the need for this
+	// is temporary (it's for skipping compilation of functions that
+	// appear in "when" clauses), and in that context it suffices.
 	std::unordered_map<const ScriptFunc*, std::shared_ptr<ProfileFunc>> func_profs;
 
 	// Maps expressions to their profiles.  This is only germane