diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index e4dd7d34f..ae478ce05 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -117,11 +117,10 @@ class MainActivity : AppCompatActivity() {
 
             window?.setDecorFitsSystemWindows(false)
 
-            // "Should we automatically acquire the insets we need and return them
-            // whenever the user wants them?"
-            // "Nah, let's make the user define what insets they want instead through
-            // a barely-documented API that is not brought up in a single tutorial!"
-            // "Great idea!"
+            // Instead of automatically fetching these insets and exposing them,
+            // the R+ SDK decides to make you specify the insets yourself with a barely
+            // documented API that isn't even mentioned in any of the edge-to-edge
+            // tutorials. Thanks android, very cool!
             binding.root.setOnApplyWindowInsetsListener { _, insets ->
                 WindowInsets.Builder()
                     .setInsets(
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt b/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt
index 38d2867db..8915c35b0 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt
@@ -80,6 +80,12 @@ class ActionMenu(
         }
 
         inflate(menuRes)
+
+        // Disable any queue options if we don't have anything playing.
+        val queueEnabled = playbackModel.song.value != null
+        menu.findItem(R.id.action_play_next)?.isEnabled = queueEnabled
+        menu.findItem(R.id.action_queue_add)?.isEnabled = queueEnabled
+
         setOnMenuItemClickListener { item ->
             onMenuClick(item.itemId)
             true
diff --git a/prebuild.py b/prebuild.py
index 92575429c..810f23316 100755
--- a/prebuild.py
+++ b/prebuild.py
@@ -76,8 +76,8 @@ sh("git clone https://github.com/oxygencobalt/ExoPlayer.git " + exoplayer_path)
 os.chdir(exoplayer_path)
 sh("git checkout auxio")
 
+print(INFO + "info:" + NC + " installing flac extension...")
 flac_ext_jni_path = os.path.join("extensions", "flac", "src", "main", "jni")
-print(INFO + "info:" + NC + " installing FLAC extension...")
 os.chdir(flac_ext_jni_path)
 sh('curl "https://ftp.osuosl.org/pub/xiph/releases/flac/flac-' + FLAC_VERSION + '.tar.xz" | tar xJ && mv "flac-' + FLAC_VERSION + '" flac')
 sh(ndk_path + "/ndk-build APP_ABI=all -j4")