diff --git a/lsplant/src/main/jni/art/runtime/art_method.hpp b/lsplant/src/main/jni/art/runtime/art_method.hpp
index 0e7169b..ec191cf 100644
--- a/lsplant/src/main/jni/art/runtime/art_method.hpp
+++ b/lsplant/src/main/jni/art/runtime/art_method.hpp
@@ -242,14 +242,12 @@ public:
         if (sdk_int <= __ANDROID_API_N__) {
             kAccCompileDontBother = 0;
         }
-        if (sdk_int <= __ANDROID_API_M__) {
+        if (sdk_int == __ANDROID_API_M__)  [[unlikely]] {
             if (!RETRIEVE_FUNC_SYMBOL(art_interpreter_to_compiled_code_bridge,
                                       "artInterpreterToCompiledCodeBridge")) {
                 return false;
             }
-            if (sdk_int == __ANDROID_API_M__) [[unlikely]] {
                 interpreter_entry_point_offset = entry_point_offset - 2 * kPointerSize;
-            }
         }
 
         return true;
diff --git a/lsplant/src/main/jni/external/dex_builder b/lsplant/src/main/jni/external/dex_builder
index 8e1672a..77f48fd 160000
--- a/lsplant/src/main/jni/external/dex_builder
+++ b/lsplant/src/main/jni/external/dex_builder
@@ -1 +1 @@
-Subproject commit 8e1672aa6da3bbc151e2fda37c04e528dffae5aa
+Subproject commit 77f48fdd795f5e178aeefb6858e3357505e5daba
diff --git a/lsplant/src/main/jni/lsplant.cc b/lsplant/src/main/jni/lsplant.cc
index 2620914..1a07528 100644
--- a/lsplant/src/main/jni/lsplant.cc
+++ b/lsplant/src/main/jni/lsplant.cc
@@ -348,7 +348,7 @@ std::tuple<jclass, jfieldID, jmethodID, jmethodID> BuildDex(JNIEnv *env, jobject
 
     jclass target_class = nullptr;
 
-    if (in_memory_class_loader_init) [[unlikely]] {
+    if (in_memory_class_loader_init) [[likely]] {
         auto dex_buffer = JNI_NewDirectByteBuffer(env, const_cast<void *>(image.ptr()),
                                                   static_cast<jlong>(image.size()));
         auto my_cl = JNI_NewObject(env, in_memory_class_loader, in_memory_class_loader_init,