diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index 9d253201..04e6f355 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -245,7 +245,7 @@ struct FunctionPointers {
 // The Cache Flush function is very processor dependent, but is needed by the
 // haystack code.  The haystack code is delivered as a static prebuilt library.
 // For that reason, we pass a function pointer for cache_flush into the
-// haystack.  The function is combiled outside of the haystack and may use
+// haystack.  The function is compiled outside of the haystack and may use
 // target (processor) specific compiler flags.
 void clear_cache_function(void *page, size_t len) {
 
@@ -309,7 +309,7 @@ struct LevelSession {
   level1_.Name = (L1_##Name##_t)dlsym(level1_library_, QUOTE(Function)); \
   if (!level1_.Name) {                                                   \
     LOGW("Could not load L1 %s. Falling Back to L3.",                    \
-         QUOTE(OEMCrypto_##Name));                                       \
+         QUOTE(Function));                                               \
     return false;                                                        \
   }
 
@@ -350,6 +350,7 @@ class Adapter {
     if (LoadLevel1()) {
       LOGD("OEMCrypto_Initialize Level 1 success. I will use level 1.");
     } else {
+      level1_ = FunctionPointers();  // revert to all null pointers.
       dlclose(level1_library_);
       level1_library_ = NULL;
       level1_valid_ = false;
diff --git a/libwvdrmengine/level3/arm/libwvlevel3.a b/libwvdrmengine/level3/arm/libwvlevel3.a
index 5cd58c0e..01d443c1 100644
Binary files a/libwvdrmengine/level3/arm/libwvlevel3.a and b/libwvdrmengine/level3/arm/libwvlevel3.a differ
diff --git a/libwvdrmengine/level3/mips/libwvlevel3.a b/libwvdrmengine/level3/mips/libwvlevel3.a
index c7e977d5..b2309fb0 100644
Binary files a/libwvdrmengine/level3/mips/libwvlevel3.a and b/libwvdrmengine/level3/mips/libwvlevel3.a differ
diff --git a/libwvdrmengine/level3/x86/libwvlevel3.a b/libwvdrmengine/level3/x86/libwvlevel3.a
index d16ca564..e6646e09 100644
Binary files a/libwvdrmengine/level3/x86/libwvlevel3.a and b/libwvdrmengine/level3/x86/libwvlevel3.a differ