diff --git a/draft-ietf-cose-hash-envelope.html b/draft-ietf-cose-hash-envelope.html
index 36907e8..6ccddca 100644
--- a/draft-ietf-cose-hash-envelope.html
+++ b/draft-ietf-cose-hash-envelope.html
@@ -1350,11 +1350,10 @@ <h3 id="name-signed-hash-envelopes-examp">
         <h3 id="name-protected-header">
 <a href="#section-2.2" class="section-number selfRef">2.2. </a><a href="#name-protected-header" class="section-name selfRef">Protected Header</a>
         </h3>
-<p id="section-2.2-1">Label <code>16</code> (typ), label <code>TBD_1</code> (payload hash alg) and label <code>TBD_2</code> (content type of the preimage of the payload) <span class="bcp14">MUST</span> be present in the protected header and <span class="bcp14">MUST NOT</span> be present in the unprotected header.<a href="#section-2.2-1" class="pilcrow">¶</a></p>
-<p id="section-2.2-2">Label <code>TBD_3</code> (payload_location) <span class="bcp14">MAY</span> be added to the protected header and <span class="bcp14">MUST NOT</span> be presented in the unprotected header.<a href="#section-2.2-2" class="pilcrow">¶</a></p>
-<p id="section-2.2-3">Label <code>3</code> (content_type) <span class="bcp14">MUST NOT</span> be used as it is easily confused with label <code>TBD_2</code> payload_preimage_content_type).<a href="#section-2.2-3" class="pilcrow">¶</a></p>
-<p id="section-2.2-4">For example:<a href="#section-2.2-4" class="pilcrow">¶</a></p>
-<div class="lang-cbor-diag sourcecode" id="section-2.2-5">
+<p id="section-2.2-1">16 (typ), TBD_1 (payload hash alg) and TBD_2 (content type of the preimage of the payload) <span class="bcp14">MUST</span> be present in the protected header and <span class="bcp14">MUST NOT</span> be present in the unprotected header.
+TBD_3 (payload_location) <span class="bcp14">MAY</span> be added to the protected header and <span class="bcp14">MUST NOT</span> be presented in the unprotected header.<a href="#section-2.2-1" class="pilcrow">¶</a></p>
+<p id="section-2.2-2">For example:<a href="#section-2.2-2" class="pilcrow">¶</a></p>
+<div class="lang-cbor-diag sourcecode" id="section-2.2-3">
 <pre>
 {
   / alg : ES384 / 1: -35,
@@ -1364,7 +1363,7 @@ <h3 id="name-protected-header">
   / payload_preimage_content_type / TBD_2: application/jwk+json
   / payload_location / TBD_3 : storage.example/244f...9c19
 }
-</pre><a href="#section-2.2-5" class="pilcrow">¶</a>
+</pre><a href="#section-2.2-3" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1375,7 +1374,7 @@ <h3 id="name-protected-header">
       <h2 id="name-encrypted-hashes">
 <a href="#section-3" class="section-number selfRef">3. </a><a href="#name-encrypted-hashes" class="section-name selfRef">Encrypted Hashes</a>
       </h2>
-<p id="section-3-1">The cose headers defined in this document <span class="bcp14">SHOULD NOT</span> be used in unprotected or protected headers associated with COSE_Encrypt.<a href="#section-3-1" class="pilcrow">¶</a></p>
+<p id="section-3-1">Should we define this?<a href="#section-3-1" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="security-considerations">
diff --git a/draft-ietf-cose-hash-envelope.txt b/draft-ietf-cose-hash-envelope.txt
index 18959f5..1c6a22d 100644
--- a/draft-ietf-cose-hash-envelope.txt
+++ b/draft-ietf-cose-hash-envelope.txt
@@ -203,15 +203,11 @@ Table of Contents
 
 2.2.  Protected Header
 
-   Label 16 (typ), label TBD_1 (payload hash alg) and label TBD_2
-   (content type of the preimage of the payload) MUST be present in the
-   protected header and MUST NOT be present in the unprotected header.
-
-   Label TBD_3 (payload_location) MAY be added to the protected header
-   and MUST NOT be presented in the unprotected header.
-
-   Label 3 (content_type) MUST NOT be used as it is easily confused with
-   label TBD_2 payload_preimage_content_type).
+   16 (typ), TBD_1 (payload hash alg) and TBD_2 (content type of the
+   preimage of the payload) MUST be present in the protected header and
+   MUST NOT be present in the unprotected header.  TBD_3
+   (payload_location) MAY be added to the protected header and MUST NOT
+   be presented in the unprotected header.
 
    For example:
 
@@ -226,8 +222,7 @@ Table of Contents
 
 3.  Encrypted Hashes
 
-   The cose headers defined in this document SHOULD NOT be used in
-   unprotected or protected headers associated with COSE_Encrypt.
+   Should we define this?
 
 4.  Security Considerations