diff --git a/src/lib/components/DriverCard.svelte b/src/lib/components/DriverCard.svelte
index 89b22f3..b17a2cd 100644
--- a/src/lib/components/DriverCard.svelte
+++ b/src/lib/components/DriverCard.svelte
@@ -5,7 +5,7 @@
   import Button from "./Button.svelte";
   import type { Driver } from "$lib/schema";
   import Input from "./Input.svelte";
-  import LazyDropdown, { type DropdownOption } from "./LazyDropdown.svelte";
+  import LazyDropdown, { type LazyDropdownOption } from "./LazyDropdown.svelte";
   import { DRIVER_HEADSHOT_HEIGHT, DRIVER_HEADSHOT_WIDTH } from "$lib/config";
 
   interface DriverCardProps {
@@ -25,7 +25,7 @@
     team_select_value: string;
 
     /** The options this component's team select dropdown will display */
-    team_select_options: DropdownOption[];
+    team_select_options: LazyDropdownOption[];
 
     /** The value this component's active switch will bind to */
     active_value: boolean;
@@ -122,6 +122,7 @@
             background="bg-primary-500"
             active="bg-tertiary-500"
             bind:checked={active_value}
+            disabled={disable_inputs}
           />
         </div>
         {#if driver}
diff --git a/src/lib/components/SubstitutionCard.svelte b/src/lib/components/SubstitutionCard.svelte
index f587229..bfbac5e 100644
--- a/src/lib/components/SubstitutionCard.svelte
+++ b/src/lib/components/SubstitutionCard.svelte
@@ -3,7 +3,7 @@
   import Button from "./Button.svelte";
   import type { Driver, Substitution } from "$lib/schema";
   import { get_by_value } from "$lib/database";
-  import LazyDropdown, { type DropdownOption } from "./LazyDropdown.svelte";
+  import LazyDropdown, { type LazyDropdownOption } from "./LazyDropdown.svelte";
   import type { Action } from "svelte/action";
   import { DRIVER_HEADSHOT_HEIGHT, DRIVER_HEADSHOT_WIDTH } from "$lib/config";
 
@@ -33,10 +33,10 @@
     race_select_value: string;
 
     /** The options this component's substitute/driver select dropdowns will display */
-    driver_select_options: DropdownOption[];
+    driver_select_options: LazyDropdownOption[];
 
     /** The options this component's race select dropdown will display */
-    race_select_options: DropdownOption[];
+    race_select_options: LazyDropdownOption[];
   }
 
   let {