diff --git a/scripts/base/init-bare.zeek b/scripts/base/init-bare.zeek
index ff013721e7..2afbfc87c7 100644
--- a/scripts/base/init-bare.zeek
+++ b/scripts/base/init-bare.zeek
@@ -3700,20 +3700,20 @@ type dns_edns_ecs: record {
 	address: string;	##< Client Subnet Address.
 };
 
-## An DNS EDNS TCP Keepalive (TCP_KA) record.
+## An DNS EDNS TCP KEEPALIVE (TCP KEEPALIVE) record.
 ##
 ## .. zeek:see:: dns_EDNS_tcp_keepalive
 type dns_edns_tcp_keepalive: record {
-	keepalive_timeout_omitted: bool; ##< Whether timeout value is omitted
-	keepalive_timeout: count; ##<  Timeout value, in 100ms
+	keepalive_timeout_omitted: bool;	##< Whether timeout value is omitted.
+	keepalive_timeout: count;	##< Timeout value, in 100ms.
 };
 
 ## An DNS EDNS COOKIE (COOKIE) record.
 ##
-## .. zeek:see:: dns_EDNS_tcp_keepalive
+## .. zeek:see:: dns_EDNS_cookie
 type dns_edns_cookie: record {
-	client_cookie: string; ##< Cookie from the client (fixed 8 bytes)
-	server_cookie: string &default=""; ##< Cookie from the server (8 to 32 bytes)
+	client_cookie: string;	##< Cookie from the client (fixed 8 bytes).
+	server_cookie: string &default="";	##< Cookie from the server (8 to 32 bytes).
 };
 
 ## An additional DNS TSIG record.
diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc
index 85733ac287..103610a578 100644
--- a/src/analyzer/protocol/dns/DNS.cc
+++ b/src/analyzer/protocol/dns/DNS.cc
@@ -816,7 +816,6 @@ bool DNS_Interpreter::ParseRR_EDNS(DNS_MsgInfo* msg,
 					{
 					// error. MUST BE 0 or 2 bytes
 					}
-				data += option_len;
 				break;
 				} // END EDNS TCP KEEPALIVE 
 
@@ -850,7 +849,6 @@ bool DNS_Interpreter::ParseRR_EDNS(DNS_MsgInfo* msg,
 					msg->BuildEDNS_COOKIE_Val(&cookie)
 				);
 
-				data += option_len;
 				break;
 				} // END EDNS COOKIE
 
diff --git a/src/analyzer/protocol/dns/events.bif b/src/analyzer/protocol/dns/events.bif
index 2567a9de9f..a3d437afe1 100644
--- a/src/analyzer/protocol/dns/events.bif
+++ b/src/analyzer/protocol/dns/events.bif
@@ -540,7 +540,7 @@ event dns_EDNS_ecs%(c: connection, msg: dns_msg, opt: dns_edns_ecs%);
 ##
 ## msg: The parsed DNS message header.
 ##
-## opt: The parsed EDNS option.
+## opt: The parsed EDNS Keepalive option.
 ##
 ## .. zeek:see:: dns_AAAA_reply dns_A_reply dns_CNAME_reply dns_HINFO_reply dns_MX_reply
 ##    dns_NS_reply dns_PTR_reply dns_SOA_reply dns_SRV_reply dns_TSIG_addl
@@ -563,7 +563,7 @@ event dns_EDNS_tcp_keepalive%(c: connection, msg: dns_msg, opt: dns_edns_tcp_kee
 ##
 ## msg: The parsed DNS message header.
 ##
-## opt: The parsed EDNS option.
+## opt: The parsed EDNS Cookie option.
 ##
 ## .. zeek:see:: dns_AAAA_reply dns_A_reply dns_CNAME_reply dns_HINFO_reply dns_MX_reply
 ##    dns_NS_reply dns_PTR_reply dns_SOA_reply dns_SRV_reply dns_TSIG_addl