diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp
index 083ad49e..16308c1f 100644
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -693,8 +693,7 @@ bool CryptoSession::UsageInformationSupport(bool* has_support) {
   LOGV("UsageInformationSupport: id=%ld", (uint32_t)oec_session_id_);
   if (!initialized_) return false;
 
-  *has_support = OEMCrypto_SupportsUsageTable(
-      kSecurityLevelL3 == GetSecurityLevel() ? kLevel3 : kLevelDefault);
+  *has_support = OEMCrypto_SupportsUsageTable(requested_security_level_);
   return true;
 }
 
diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp
index efbb56d2..81de1110 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp
@@ -487,7 +487,7 @@ OEMCryptoResult OEMCrypto_DecryptCTR(OEMCrypto_SESSION session,
                                      bool is_encrypted,
                                      const uint8_t* iv,
                                      size_t block_offset,
-                                     const OEMCrypto_DestBufferDesc* out_buffer,
+                                     OEMCrypto_DestBufferDesc* out_buffer,
                                      uint8_t subsample_flags) {
   if (LogCategoryEnabled(kLoggingTraceOEMCryptoCalls)) {
     LOGI("-- OEMCryptoResult OEMCrypto_DecryptCTR"