diff --git a/compress_generate.go b/compress_generate.go
index d2e5db26..87fb36f6 100644
--- a/compress_generate.go
+++ b/compress_generate.go
@@ -18,8 +18,7 @@ import (
 )
 
 var packageHdr = `
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from compress_generate.go
+// Code generated by "go run compress_generate.go"; DO NOT EDIT.
 
 package dns
 
diff --git a/msg_generate.go b/msg_generate.go
index 4d9f81d4..8ba609f7 100644
--- a/msg_generate.go
+++ b/msg_generate.go
@@ -18,8 +18,7 @@ import (
 )
 
 var packageHdr = `
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from msg_generate.go
+// Code generated by "go run msg_generate.go"; DO NOT EDIT.
 
 package dns
 
diff --git a/types_generate.go b/types_generate.go
index 73720fe5..3eec3392 100644
--- a/types_generate.go
+++ b/types_generate.go
@@ -27,8 +27,7 @@ var skipLen = map[string]struct{}{
 }
 
 var packageHdr = `
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from types_generate.go
+// Code generated by "go run types_generate.go"; DO NOT EDIT.
 
 package dns
 
diff --git a/zcompress.go b/zcompress.go
index ee9841ed..c2503204 100644
--- a/zcompress.go
+++ b/zcompress.go
@@ -1,5 +1,4 @@
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from compress_generate.go
+// Code generated by "go run compress_generate.go"; DO NOT EDIT.
 
 package dns
 
diff --git a/zmsg.go b/zmsg.go
index 969977f8..0d1f6f4d 100644
--- a/zmsg.go
+++ b/zmsg.go
@@ -1,5 +1,4 @@
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from msg_generate.go
+// Code generated by "go run msg_generate.go"; DO NOT EDIT.
 
 package dns
 
diff --git a/ztypes.go b/ztypes.go
index 74591e95..b4a3292d 100644
--- a/ztypes.go
+++ b/ztypes.go
@@ -1,5 +1,4 @@
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from types_generate.go
+// Code generated by "go run types_generate.go"; DO NOT EDIT.
 
 package dns
 
@@ -592,9 +591,9 @@ func (rr *TKEY) len() int {
 	l += 2 // Mode
 	l += 2 // Error
 	l += 2 // KeySize
-	l += len(rr.Key) + 1
+	l += len(rr.Key)/2 + 1
 	l += 2 // OtherLen
-	l += len(rr.OtherData) + 1
+	l += len(rr.OtherData)/2 + 1
 	return l
 }
 func (rr *TLSA) len() int {