diff --git a/app/build.gradle b/app/build.gradle
index 323441507..30c101023 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,7 +98,7 @@ dependencies {
     implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version"
 
     // Image loading
-    implementation "io.coil-kt:coil:1.1.1"
+    implementation "io.coil-kt:coil:1.2.0"
 
     // Material
     implementation "com.google.android.material:material:1.3.0"
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
index 8f36fa6f1..f08c00c2f 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
@@ -260,16 +260,14 @@ class PlaybackStateManager private constructor() {
 
             forceUserQueueUpdate()
         } else {
-            // Increment the index.
-            // If it cant be incremented anymore, end playback or loop depending on the setting.
+            // Increment the index, if it cannot be incremented any further, then
+            // loop and pause/resume playback depending on the setting
             if (mIndex < mQueue.lastIndex) {
                 mIndex = mIndex.inc()
                 updatePlayback(mQueue[mIndex])
             } else {
                 mIndex = 0
                 updatePlayback(mQueue[mIndex], shouldPlay = mLoopMode == LoopMode.ALL)
-
-                return
             }
 
             forceQueueUpdate()
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/SlideLinearLayout.kt b/app/src/main/java/org/oxycblt/auxio/ui/SlideLinearLayout.kt
index ee8ed3eb6..81208bac8 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/SlideLinearLayout.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/SlideLinearLayout.kt
@@ -65,7 +65,7 @@ class SlideLinearLayout @JvmOverloads constructor(
                 var consumed = false
 
                 children.forEach { view ->
-                    consumed = consumed or super.drawChild(canvas, view, drawingTime)
+                    consumed = consumed || super.drawChild(canvas, view, drawingTime)
                 }
 
                 return consumed