diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 57073797..5bbdfb42 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="309"
+    android:versionCode="310"
     android:versionName="1.5.15">
 
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
diff --git a/app/src/main/java/space/celestia/mobilecelestia/common/EdgeInsets.kt b/app/src/main/java/space/celestia/mobilecelestia/common/EdgeInsets.kt
index 1a131210..41a21ce9 100644
--- a/app/src/main/java/space/celestia/mobilecelestia/common/EdgeInsets.kt
+++ b/app/src/main/java/space/celestia/mobilecelestia/common/EdgeInsets.kt
@@ -17,9 +17,9 @@ import kotlin.math.max
 
 class EdgeInsets(val left: Int = 0, val top: Int = 0, val right: Int = 0, val bottom: Int = 0) {
     constructor(insets: WindowInsetsCompat?) : this(
-        insets?.systemWindowInsetLeft ?: 0,
-        insets?.systemWindowInsetTop ?: 0,
-        insets?.systemWindowInsetRight ?: 0,
+        insets?.stableInsetLeft ?: 0,
+        insets?.stableInsetTop ?: 0,
+        insets?.stableInsetRight ?: 0,
         insets?.stableInsetBottom ?: 0)
 
     constructor(edgeInsets: EdgeInsets, roundedCorners: RoundedCorners, configuration: Configuration) : this(
diff --git a/app/src/main/java/space/celestia/mobilecelestia/travel/GoToSuggestionAdapter.kt b/app/src/main/java/space/celestia/mobilecelestia/travel/GoToSuggestionAdapter.kt
index 0408ed1c..a0ec3117 100644
--- a/app/src/main/java/space/celestia/mobilecelestia/travel/GoToSuggestionAdapter.kt
+++ b/app/src/main/java/space/celestia/mobilecelestia/travel/GoToSuggestionAdapter.kt
@@ -48,6 +48,7 @@ class GoToSuggestionAdapter(context: Context, textViewResourceId: Int, private v
             }
 
             override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
+                @Suppress("UNCHECKED_CAST")
                 resultList = results?.values as? List<String> ?: listOf()
                 if (resultList.size > 0) {
                     notifyDataSetChanged()