diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ff96bb7..7755611 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,7 +72,7 @@ jobs:
 
     - name: Install dep
       run: |
-        sudo apt-get install -y ccache ninja-build
+        sudo apt-get install -y ccache
         ccache -o max_size=1G
         ccache -o hash_dir=false
         ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'
@@ -87,8 +87,6 @@ jobs:
         echo 'org.gradle.vfs.watch=true' >> gradle.properties
         echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
         echo 'android.native.buildOutput=verbose' >> gradle.properties
-        ln -s $(which ninja) $(dirname $(which cmake)) # https://issuetracker.google.com/issues/206099937
-        echo "cmake.dir=$(dirname $(dirname $(which cmake)))" >> local.properties
         ./gradlew buildAll
         ccache -s
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c740fa3..03a56ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -73,6 +73,10 @@ fun Project.configureBaseExtension() {
         ndkVersion = androidCompileNdkVersion
         buildToolsVersion = androidBuildToolsVersion
 
+        externalNativeBuild.cmake {
+            version = "3.22.1+"
+        }
+
         defaultConfig {
             minSdk = androidMinSdkVersion
             targetSdk = androidTargetSdkVersion
diff --git a/core b/core
index b36c170..dd8dcfb 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit b36c170b8c6e138b7211371c47764f63c83a6f1e
+Subproject commit dd8dcfbab1d8aa8a408ab57cb5e934684679533d
diff --git a/gradle.properties b/gradle.properties
index 6f11f1b..f1a4ddc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,4 @@ android.nonTransitiveRClass=true
 android.enableR8.fullMode=true
 android.useAndroidX=true
 
-agpVersion=7.2.0
+agpVersion=7.2.1
diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
index d77c6fa..a6fcc64 100644
--- a/manager/build.gradle.kts
+++ b/manager/build.gradle.kts
@@ -37,7 +37,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.2.0-beta01"
+        kotlinCompilerExtensionVersion = "1.2.0-beta02"
     }
 
     sourceSets["main"].assets.srcDirs(rootProject.projectDir.resolve("out/assets"))
@@ -77,17 +77,17 @@ dependencies {
     implementation("dev.rikka.hidden:compat:2.3.1")
     implementation("androidx.core:core-ktx:1.7.0")
     implementation("androidx.activity:activity-compose:1.6.0-alpha03")
-    implementation("androidx.compose.material:material-icons-extended:1.2.0-beta01")
-    implementation("androidx.compose.material3:material3:1.0.0-alpha11")
-    implementation("androidx.compose.runtime:runtime-livedata:1.2.0-beta01")
-    implementation("androidx.compose.ui:ui:1.2.0-beta01")
-    implementation("androidx.compose.ui:ui-tooling:1.2.0-beta01")
+    implementation("androidx.compose.material:material-icons-extended:1.2.0-beta02")
+    implementation("androidx.compose.material3:material3:1.0.0-alpha12")
+    implementation("androidx.compose.runtime:runtime-livedata:1.2.0-beta02")
+    implementation("androidx.compose.ui:ui:1.2.0-beta02")
+    implementation("androidx.compose.ui:ui-tooling:1.2.0-beta02")
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0-rc01")
     implementation("androidx.navigation:navigation-compose:2.5.0-rc01")
     implementation("androidx.preference:preference:1.2.0")
-    implementation("com.google.accompanist:accompanist-drawablepainter:0.24.8-beta")
-    implementation("com.google.accompanist:accompanist-navigation-animation:0.24.8-beta")
-    implementation("com.google.accompanist:accompanist-swiperefresh:0.24.8-beta")
+    implementation("com.google.accompanist:accompanist-drawablepainter:0.24.9-beta")
+    implementation("com.google.accompanist:accompanist-navigation-animation:0.24.9-beta")
+    implementation("com.google.accompanist:accompanist-swiperefresh:0.24.9-beta")
     implementation("com.google.android.material:material:1.6.0")
     implementation("com.google.code.gson:gson:2.9.0")
     implementation("dev.rikka.shizuku:api:12.1.0")
diff --git a/manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt b/manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt
index 6a16c77..71a378f 100644
--- a/manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt
+++ b/manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt
@@ -32,7 +32,7 @@ import kotlin.coroutines.suspendCoroutine
 
 object LSPPackageManager {
 
-    const val TAG = "LSPPackageManager"
+    private const val TAG = "LSPPackageManager"
 
     @Parcelize
     class AppInfo(val app: ApplicationInfo, val label: String) : Parcelable
diff --git a/patch-loader/src/main/jni/src/patch_loader.cpp b/patch-loader/src/main/jni/src/patch_loader.cpp
index 79bbf6a..28c8a9a 100644
--- a/patch-loader/src/main/jni/src/patch_loader.cpp
+++ b/patch-loader/src/main/jni/src/patch_loader.cpp
@@ -100,7 +100,7 @@ namespace lspd {
                     return GetArt()->getSymbAddress<void*>(symbol);
                 },
                 .art_symbol_prefix_resolver = [](auto symbol) {
-                    return GetArt()->getSymbPrefixFirstOffset(symbol);
+                    return GetArt()->getSymbPrefixFirstAddress(symbol);
                 },
         };