diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index d2c7435731..b5df7631a0 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -134,10 +134,6 @@
 
         <!-- Location -->
 
-        <activity
-            android:name="org.microg.nlp.ui.BackendSettingsActivity"
-            android:process=":ui" />
-
         <activity
             android:name="org.microg.gms.ui.PlacePickerActivity"
             android:exported="true"
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/network/wifi/WifiScannerSource.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/network/wifi/WifiScannerSource.kt
index fb4407b1b5..375db46f42 100644
--- a/play-services-location/core/src/main/kotlin/org/microg/gms/location/network/wifi/WifiScannerSource.kt
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/network/wifi/WifiScannerSource.kt
@@ -5,6 +5,7 @@
 
 package org.microg.gms.location.network.wifi
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.wifi.ScanResult
 import android.net.wifi.WifiScanner
@@ -12,6 +13,7 @@ import android.os.WorkSource
 import android.util.Log
 import org.microg.gms.location.network.TAG
 
+@SuppressLint("WrongConstant")
 class WifiScannerSource(private val context: Context, private val callback: WifiDetailsCallback) : WifiDetailsSource {
     override fun startScan(workSource: WorkSource?) {
         val scanner = context.getSystemService("wifiscanner") as WifiScanner
diff --git a/play-services-location/src/main/java/com/google/android/gms/location/GeofencingEvent.java b/play-services-location/src/main/java/com/google/android/gms/location/GeofencingEvent.java
index 2be39c826b..16706fa0cd 100644
--- a/play-services-location/src/main/java/com/google/android/gms/location/GeofencingEvent.java
+++ b/play-services-location/src/main/java/com/google/android/gms/location/GeofencingEvent.java
@@ -8,6 +8,7 @@
 
 package com.google.android.gms.location;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.location.Location;
 
@@ -48,15 +49,14 @@ public class GeofencingEvent {
      * @param intent the intent to extract the geofencing event data from
      * @return a {@link GeofencingEvent} object or {@code null} if the given intent is {@code null}
      */
+
     public static GeofencingEvent fromIntent(Intent intent) {
         if (intent == null) {
             return null;
         }
         GeofencingEvent event = new GeofencingEvent();
         event.errorCode = intent.getIntExtra(EXTRA_ERROR_CODE, -1);
-        event.geofenceTransition = intent.getIntExtra(EXTRA_TRANSITION, -1);
-        if (event.geofenceTransition != 1 && event.geofenceTransition != 2 && event.geofenceTransition != 4)
-            event.geofenceTransition = -1;
+        event.geofenceTransition = validate(intent.getIntExtra(EXTRA_TRANSITION, -1));
         ArrayList<byte[]> parceledGeofences = (ArrayList<byte[]>) intent.getSerializableExtra(EXTRA_GEOFENCE_LIST);
         if (parceledGeofences != null) {
             event.triggeringGeofences = new ArrayList<Geofence>();
@@ -68,6 +68,14 @@ public static GeofencingEvent fromIntent(Intent intent) {
         return event;
     }
 
+    @SuppressLint("WrongConstant")
+    private static @Geofence.GeofenceTransition int validate(@Geofence.GeofenceTransition int geofenceTransition) {
+        if (geofenceTransition != Geofence.GEOFENCE_TRANSITION_ENTER && geofenceTransition != Geofence.GEOFENCE_TRANSITION_EXIT && geofenceTransition != Geofence.GEOFENCE_TRANSITION_DWELL) {
+            return -1;
+        }
+        return geofenceTransition;
+    }
+
     /**
      * Returns the error code that explains the error that triggered the intent specified in
      * {@link #fromIntent(Intent)}.
diff --git a/play-services-location/system-api/src/main/java/android/location/LocationRequest.java b/play-services-location/system-api/src/main/java/android/location/LocationRequest.java
index 04530a9bc9..4d788ba92a 100644
--- a/play-services-location/system-api/src/main/java/android/location/LocationRequest.java
+++ b/play-services-location/system-api/src/main/java/android/location/LocationRequest.java
@@ -72,6 +72,7 @@
  *
  * @hide
  */
+@SuppressWarnings("WrongConstant")
 public final class LocationRequest implements Parcelable {
     /**
      * Used with {@link #setQuality} to request the most accurate locations available.