diff --git a/app/components/Layout/MobileNav.tsx b/app/components/Layout/MobileNav.tsx
index 312310bd7..9e0af8d69 100644
--- a/app/components/Layout/MobileNav.tsx
+++ b/app/components/Layout/MobileNav.tsx
@@ -31,7 +31,7 @@ export function MobileNav({
                 })}
                 to={navItem.disabled ? "/" : navItem.name}
                 onClick={closeMenu}
-                data-cy={`mobile-nav-link-${navItem}`}
+                data-cy={`mobile-nav-link-${navItem.name}`}
               >
                 <img
                   className={clsx("layout__mobile-nav__link__icon", {
diff --git a/app/components/Layout/index.tsx b/app/components/Layout/index.tsx
index 75e10ab7b..102906b20 100644
--- a/app/components/Layout/index.tsx
+++ b/app/components/Layout/index.tsx
@@ -51,7 +51,7 @@ export const Layout = React.memo(function Layout({
                     disabled: navItem.disabled,
                   })}
                   to={navItem.disabled ? "/" : navItem.name}
-                  data-cy={`nav-link-${navItem}`}
+                  data-cy={`nav-link-${navItem.name}`}
                 >
                   <img
                     src={layoutIcon(navItem.name.replace(" ", ""))}
diff --git a/server/auth.ts b/server/auth.ts
index 34ced3968..a2508e09d 100644
--- a/server/auth.ts
+++ b/server/auth.ts
@@ -123,6 +123,7 @@ export function setUpAuth(app: Express): void {
     return passport.authenticate("discord")(req, res);
   });
   app.get("/auth/discord/callback", (req, res) => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const returnTo = req.session?.returnTo ?? process.env.FRONT_PAGE_URL;
     if (req.session?.returnTo) {
       delete req.session.returnTo;
@@ -130,6 +131,7 @@ export function setUpAuth(app: Express): void {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
     return passport.authenticate("discord", {
       failureRedirect: "/login",
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       successRedirect: returnTo,
     })(req, res);
   });