diff --git a/sites/org/components/curate/sets/edit.mjs b/sites/org/components/curate/sets/edit.mjs
index 5764eb0fe12..f834a50f8d0 100644
--- a/sites/org/components/curate/sets/edit.mjs
+++ b/sites/org/components/curate/sets/edit.mjs
@@ -4,8 +4,6 @@ import { siteConfig } from 'site/site.config.mjs'
 import { freeSewingConfig as conf } from 'shared/config/freesewing.config.mjs'
 import { measurements } from 'config/measurements.mjs'
 import { measurements as designMeasurements } from 'shared/prebuild/data/design-measurements.mjs'
-// Context
-import { ModalContext } from 'shared/context/modal-context.mjs'
 // Hooks
 import { useState, useEffect, useContext } from 'react'
 import { useTranslation } from 'next-i18next'
diff --git a/sites/org/pages/account/bookmarks/[id].mjs b/sites/org/pages/account/bookmarks/[id].mjs
index db3623e8f42..1b36edc05af 100644
--- a/sites/org/pages/account/bookmarks/[id].mjs
+++ b/sites/org/pages/account/bookmarks/[id].mjs
@@ -6,7 +6,7 @@ import { nsMerge } from 'shared/utils.mjs'
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
 import { useTranslation } from 'next-i18next'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useContext } from 'react'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
 import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
diff --git a/sites/shared/components/account/language.mjs b/sites/shared/components/account/language.mjs
index 16b17d32de9..20f37ca19ad 100644
--- a/sites/shared/components/account/language.mjs
+++ b/sites/shared/components/account/language.mjs
@@ -12,7 +12,7 @@ import { DynamicOrgDocs } from 'shared/components/dynamic-docs/org.mjs'
 // Config
 import { siteConfig as conf } from 'site/site.config.mjs'
 
-export const ns = ['account', 'locales', statusNs]
+export const ns = ['account', 'locales', 'status']
 
 export const LanguageSettings = () => {
   // Hooks
diff --git a/sites/shared/components/bookmarks.mjs b/sites/shared/components/bookmarks.mjs
index 6fea9d4ccf6..04fc41499b9 100644
--- a/sites/shared/components/bookmarks.mjs
+++ b/sites/shared/components/bookmarks.mjs
@@ -21,7 +21,7 @@ export const CreateBookmark = ({ type, title, slug }) => {
   const { setLoadingStatus } = useContext(LoadingStatusContext)
   const { setModal } = useContext(ModalContext)
 
-  const url = i18n.language === 'en' ? `/${slug}` : `/${lang}/${slug}`
+  const url = i18n.language === 'en' ? `/${slug}` : `/${i18n.language}/${slug}`
 
   const bookmark = async (evt) => {
     evt.stopPropagation()
diff --git a/sites/shared/context/loading-status-context.mjs b/sites/shared/context/loading-status-context.mjs
index f5287317f7d..00d9c33e8b4 100644
--- a/sites/shared/context/loading-status-context.mjs
+++ b/sites/shared/context/loading-status-context.mjs
@@ -1,3 +1,6 @@
+/* eslint-disable */
+// Not sure why but eslint does not seem to understand this file
+// and I don't have time to hold its hand.
 import { useState, useEffect, createContext } from 'react'
 import { Spinner } from 'shared/components/spinner.mjs'
 import { OkIcon, WarningIcon } from 'shared/components/icons.mjs'