diff --git a/app/models/sports-season.ts b/app/models/sports-season.ts
index 184272c..72acfe7 100644
--- a/app/models/sports-season.ts
+++ b/app/models/sports-season.ts
@@ -155,9 +155,9 @@ export async function findDraftableSportsSeasonBySportId(sportId: string) {
   const db = database();
   const today = sql`CURRENT_DATE`;
   return await db.query.sportsSeasons.findFirst({
-    where: (ss, { and, eq }) =>
-      and(
-        eq(ss.sportId, sportId),
+    where: (ss, ops) =>
+      ops.and(
+        ops.eq(ss.sportId, sportId),
         lte(ss.draftOn, today),
         gte(ss.draftOff, today),
         isNull(ss.fantasySeasonId)
diff --git a/app/routes/leagues/new.tsx b/app/routes/leagues/new.tsx
index dfaa999..4d00def 100644
--- a/app/routes/leagues/new.tsx
+++ b/app/routes/leagues/new.tsx
@@ -114,7 +114,7 @@ export async function loader(args: Route.LoaderArgs) {
         ...template,
         sportsSeasonIds: (t?.seasonTemplateSports ?? [])
           .map((ts: { sportId: string }) => draftableSeasonBySportId.get(ts.sportId)?.id)
-          .filter((id): id is string => id != null),
+          .filter((id): id is string => id !== null && id !== undefined),
       };
     })
   );