diff --git a/src/credentials/DeviceAttestationVendorReserved.h b/src/credentials/DeviceAttestationVendorReserved.h
index d9dd9116256cd9..600dd7be2eba32 100644
--- a/src/credentials/DeviceAttestationVendorReserved.h
+++ b/src/credentials/DeviceAttestationVendorReserved.h
@@ -60,7 +60,7 @@ class DeviceAttestationVendorReservedDeconstructor
             if (!TLV::IsContextTag(tag))
                 break;
         }
-        // positioned to first context tag (vendor reserved data)
+        // positioned to first non-context tag (vendor reserved data)
         mIsInitialized  = true;
         mIsAtFirstToken = true;
         return CHIP_NO_ERROR;
diff --git a/src/lib/core/CHIPTLVTags.h b/src/lib/core/CHIPTLVTags.h
index 984d54845d99c2..802f307c248216 100644
--- a/src/lib/core/CHIPTLVTags.h
+++ b/src/lib/core/CHIPTLVTags.h
@@ -167,7 +167,7 @@ inline uint32_t ProfileIdFromTag(Tag tag)
  */
 inline uint16_t ProfileNumFromTag(Tag tag)
 {
-    return static_cast<uint16_t>((tag & kProfileNumMask) >> kProfileIdShift);
+    return static_cast<uint16_t>((tag & kProfileNumMask) >> kProfileNumShift);
 }
 
 /**