diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
index 78636e93..8cb70a55 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
+++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
@@ -35,8 +35,7 @@ class MapFragmentImpl(private val activity: Activity) : IMapFragmentDelegate.Stu
     private var map: GoogleMapImpl? = null
     private var options: GoogleMapOptions? = null
 
-    override fun onInflate(activity: IObjectWrapper, options: GoogleMapOptions, savedInstanceState: Bundle) {
-        Log.d(TAG, "onInflate: ${options.camera.target}")
+    override fun onInflate(activity: IObjectWrapper, options: GoogleMapOptions, savedInstanceState: Bundle?) {
         this.options = options
         map?.options = options
     }
@@ -48,7 +47,6 @@ class MapFragmentImpl(private val activity: Activity) : IMapFragmentDelegate.Stu
         if (options == null) {
             options = GoogleMapOptions()
         }
-        Log.d(TAG, "onCreate: ${options?.camera?.target}")
         map = GoogleMapImpl(activity, options ?: GoogleMapOptions())
     }
 
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt
index bfcda14e..598860f0 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt
+++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt
@@ -29,7 +29,10 @@ class MultiArchLoader(private val mapContext: Context, private val appContext: C
     override fun load(name: String) {
         try {
             val otherAppInfo = mapContext.packageManager.getApplicationInfo(appContext.packageName, 0)
-            val primaryCpuAbi = ApplicationInfo::class.java.getField("primaryCpuAbi").get(otherAppInfo) as String?
+            var primaryCpuAbi = ApplicationInfo::class.java.getField("primaryCpuAbi").get(otherAppInfo) as String?
+            if (primaryCpuAbi == "armeabi") {
+                primaryCpuAbi = "armeabi-v7a"
+            }
             if (primaryCpuAbi != null) {
                 val path = "lib/$primaryCpuAbi/lib$name.so"
                 val cacheFile = File("${appContext.cacheDir.absolutePath}/.gmscore/$path")