diff --git a/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp b/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
index 92a82b8e..c8a9c3b0 100644
--- a/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
+++ b/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
@@ -19,7 +19,9 @@ CoreMessageFeatures CoreMessageFeatures::DefaultFeatures(
     uint32_t maximum_major_version) {
   CoreMessageFeatures features;
   features.maximum_major_version = maximum_major_version;
-  // The default minor version is the highest for each major version.
+  // The default minor version is the highest for each major version. This also
+  // needs to be updated with new version releases in
+  // ODK_InitializeSessionValues() when the minor version is being set.
   switch (maximum_major_version) {
     case 16:
       features.maximum_minor_version = 5;  // 16.5
diff --git a/libwvdrmengine/oemcrypto/odk/src/odk_timer.c b/libwvdrmengine/oemcrypto/odk/src/odk_timer.c
index ae5918a5..c837d783 100644
--- a/libwvdrmengine/oemcrypto/odk/src/odk_timer.c
+++ b/libwvdrmengine/oemcrypto/odk/src/odk_timer.c
@@ -264,6 +264,8 @@ OEMCryptoResult ODK_InitializeSessionValues(ODK_TimerLimits* timer_limits,
   ODK_InitializeClockValues(clock_values, 0);
 
   nonce_values->api_major_version = api_major_version;
+  // This needs to be updated with new version releases in the default features
+  // of core message features.
   switch (nonce_values->api_major_version) {
     case 16:
       nonce_values->api_minor_version = 5;