diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index 0f016133..c96ef9cd 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -1063,7 +1063,7 @@ bool OEMCrypto_SupportsUsageTable(SecurityLevel level) {
   const FunctionPointers* fcn = kAdapter->get(level);
   if (!fcn) return false;
   if (fcn->version == 8) return false;
-  if (fcn->SupportsUsageTable == NULL) return OEMCrypto_ERROR_NOT_IMPLEMENTED;
+  if (fcn->SupportsUsageTable == NULL) return false;
   return fcn->SupportsUsageTable();
 }
 
@@ -1072,8 +1072,7 @@ bool OEMCrypto_IsAntiRollbackHwPresent(SecurityLevel level) {
   const FunctionPointers* fcn = kAdapter->get(level);
   if (!fcn) return false;
   if (fcn->version < 10) return false;
-  if (fcn->IsAntiRollbackHwPresent == NULL)
-    return OEMCrypto_ERROR_NOT_IMPLEMENTED;
+  if (fcn->IsAntiRollbackHwPresent == NULL) return false;
   return fcn->IsAntiRollbackHwPresent();
 }
 
diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp
index 53df923a..9ed3f6de 100644
--- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp
+++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp
@@ -10,7 +10,6 @@
 
 #include "keys.h"
 #include "log.h"
-#include "oemcrypto_key_ref.h"
 #include "oemcrypto_rsa_key_shared.h"
 
 namespace {