diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
index c86ad8753..f82086459 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
@@ -100,19 +100,19 @@ class PlaybackViewModel(application: Application) :
 
     /** Play a song from it's album. */
     fun playFromAlbum(song: Song) {
-        playbackManager.play(song, song.album, settings, false)
+        playbackManager.play(song, song.album, settings)
     }
 
     /** Play a song from it's artist. */
     fun playFromArtist(song: Song, artist: Artist) {
         check(artist.songs.contains(song)) { "Invalid input: Artist is not linked to song" }
-        playbackManager.play(song, artist, settings, false)
+        playbackManager.play(song, artist, settings)
     }
 
     /** Play a song from the specific genre that contains the song. */
     fun playFromGenre(song: Song, genre: Genre) {
         check(genre.songs.contains(song)) { "Invalid input: Genre is not linked to song" }
-        playbackManager.play(song, genre, settings, false)
+        playbackManager.play(song, genre, settings)
     }
 
     /**
diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
index a70fae475..3bf944fe8 100644
--- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
@@ -30,7 +30,6 @@ import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.util.isLandscape
 import org.oxycblt.auxio.util.logD
 import org.oxycblt.auxio.util.logW
-import org.oxycblt.auxio.util.unlikelyToBeNull
 
 /**
  * Auxio's one and only appwidget. This widget follows a more unorthodox approach, effectively
@@ -170,9 +169,9 @@ class WidgetProvider : AppWidgetProvider() {
 
                 val layout =
                     candidates.maxByOrNull { it.height * it.width }
-                        ?: unlikelyToBeNull(views.minOfOrNull { it.key.width * it.key.height })
+                        ?: views.minBy { it.key.width * it.key.height }.key
 
-                logD("Using widget layout $layout")
+                logD("Using widget layout $layout ${views.contains(layout)}")
                 updateAppWidget(id, views[layout])
             }
         }
diff --git a/build.gradle b/build.gradle
index d507158b2..a02a518ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.7.20'
     ext.navigation_version = "2.5.2"
 
     repositories {
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath "com.android.tools.build:gradle:7.3.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:6.10.0"