diff --git a/apps/demo/src/index.scss b/apps/demo/src/index.scss
index da8d3e6..3d17ac1 100644
--- a/apps/demo/src/index.scss
+++ b/apps/demo/src/index.scss
@@ -1,11 +1,12 @@
+@use "sass:map";
 @use "@openfun/cunningham-react/sass/fonts";
 @use "@openfun/cunningham-react/sass/icons";
 @use "@openfun/cunningham-react/style";
 @use "cunningham-tokens";
 @use "cunningham-tokens-sass" as *;
 
-$lg: map-get($themes, "default", "theme", "breakpoints", "lg");
-$sm: map-get($themes, "default", "theme", "breakpoints", "sm");
+$lg: map.get($themes, "default", "theme", "breakpoints", "lg");
+$sm: map.get($themes, "default", "theme", "breakpoints", "sm");
 
 // Reset
 h1 {
diff --git a/packages/react/src/components/Forms/DatePicker/Calendar.tsx b/packages/react/src/components/Forms/DatePicker/Calendar.tsx
index 0752bae..beaeee7 100644
--- a/packages/react/src/components/Forms/DatePicker/Calendar.tsx
+++ b/packages/react/src/components/Forms/DatePicker/Calendar.tsx
@@ -1,6 +1,7 @@
 import React, { RefAttributes, useMemo, useRef, useState } from "react";
 import {
   CalendarDate,
+  CalendarIdentifier,
   createCalendar,
   DateValue,
   GregorianCalendar,
@@ -132,7 +133,8 @@ const CalendarAux = ({
 
   const yearItems: Array<Option> = useMemo(() => {
     const calendarCurrentUser = createCalendar(
-      new Intl.DateTimeFormat().resolvedOptions().calendar,
+      new Intl.DateTimeFormat().resolvedOptions()
+        .calendar as CalendarIdentifier,
     );
     const minDate = toCalendar(
       new CalendarDate(new GregorianCalendar(), minYear, 1, 1),