diff --git a/app/src/main/java/emu/skyline/EmulationActivity.kt b/app/src/main/java/emu/skyline/EmulationActivity.kt
index 8077fa58..838ef17a 100644
--- a/app/src/main/java/emu/skyline/EmulationActivity.kt
+++ b/app/src/main/java/emu/skyline/EmulationActivity.kt
@@ -482,7 +482,9 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
                 }
                 R.id.menu_settings -> {
                     startActivity(Intent(this@EmulationActivity, SettingsActivity::class.java).apply {
-                        if (!emulationSettings.isGlobal && emulationSettings.useCustomSettings) putExtra("AppItemTag", item)
+                        val args = Bundle()
+                        args.putSerializable(AppItemTag, item)
+                        if (!emulationSettings.isGlobal && emulationSettings.useCustomSettings) putExtras(args)
                     })
                     true
                 }
diff --git a/app/src/main/java/emu/skyline/settings/GameSettingsFragment.kt b/app/src/main/java/emu/skyline/settings/GameSettingsFragment.kt
index d0e045b2..26b57390 100644
--- a/app/src/main/java/emu/skyline/settings/GameSettingsFragment.kt
+++ b/app/src/main/java/emu/skyline/settings/GameSettingsFragment.kt
@@ -14,6 +14,7 @@ import emu.skyline.R
 import emu.skyline.data.AppItem
 import emu.skyline.data.AppItemTag
 import emu.skyline.preference.GpuDriverPreference
+import emu.skyline.preference.SeekBarPreference
 import emu.skyline.utils.GpuDriverHelper
 import emu.skyline.utils.WindowInsetsHelper
 import emu.skyline.utils.serializable
@@ -62,6 +63,8 @@ class GameSettingsFragment : PreferenceFragmentCompat() {
 
         findPreference<GpuDriverPreference>("gpu_driver")?.item = item
 
+        findPreference<SeekBarPreference>("executor_slot_count_scale")?.setMaxValue(Runtime.getRuntime().availableProcessors().toInt())
+
         findPreference<SwitchPreferenceCompat>("enable_speed_limit")?.isChecked?.let {
             disablePreference("speed_limit", !it, null)
         }
diff --git a/app/src/main/java/emu/skyline/settings/GlobalSettingsFragment.kt b/app/src/main/java/emu/skyline/settings/GlobalSettingsFragment.kt
index fda5e710..f05acd4a 100644
--- a/app/src/main/java/emu/skyline/settings/GlobalSettingsFragment.kt
+++ b/app/src/main/java/emu/skyline/settings/GlobalSettingsFragment.kt
@@ -22,6 +22,7 @@ import emu.skyline.R
 import emu.skyline.utils.GpuDriverHelper
 import emu.skyline.utils.WindowInsetsHelper
 import emu.skyline.SkylineApplication
+import emu.skyline.preference.SeekBarPreference
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -65,6 +66,8 @@ class GlobalSettingsFragment : PreferenceFragmentCompat() {
                 }
             }
         }
+
+        findPreference<SeekBarPreference>("executor_slot_count_scale")?.setMaxValue(Runtime.getRuntime().availableProcessors().toInt())
         
         // Only show validation layer setting in debug builds
         @Suppress("SENSELESS_COMPARISON")