diff --git a/packages/date/src/calendar/calendar-cell.css b/packages/date/src/calendar/calendar-cell.css
index 0e1d01e5cd..1b5d79c707 100644
--- a/packages/date/src/calendar/calendar-cell.css
+++ b/packages/date/src/calendar/calendar-cell.css
@@ -1,4 +1,4 @@
-@layer sl-expended-components {
+@layer sl-extended-components {
   [data-sl-calendar-cell-button] {
     width: 100%;
     height: 100%;
diff --git a/packages/date/src/calendar/calendar-provider.tsx b/packages/date/src/calendar/calendar-provider.tsx
index d47fce3096..47e57f2141 100644
--- a/packages/date/src/calendar/calendar-provider.tsx
+++ b/packages/date/src/calendar/calendar-provider.tsx
@@ -1,6 +1,7 @@
 import type { CalendarState } from '@react-stately/calendar'
 import React, { createContext, useContext } from 'react'
 import type { Store } from '@vtex/shoreline-store'
+import { invariant } from '@vtex/shoreline-utils'
 
 export const CalendarContext = createContext<Store<CalendarState> | null>(null)
 
@@ -15,9 +16,7 @@ export function CalendarProvider({ store, children }: any) {
 export function useCalendarContext() {
   const context = useContext(CalendarContext)
 
-  if (!context) {
-    throw new Error('Calendar components must be wrapped by CalendarProvider')
-  }
+  invariant(context, 'Calendar components must be wrapped by CalendarProvider')
 
   return context
 }
diff --git a/packages/date/src/calendar/calendar.tsx b/packages/date/src/calendar/calendar.tsx
index 00c410e52b..0169616caa 100644
--- a/packages/date/src/calendar/calendar.tsx
+++ b/packages/date/src/calendar/calendar.tsx
@@ -31,10 +31,9 @@ export function Calendar(props: CalendarProps) {
       <div data-sl-calendar {...calendarProps}>
         <div data-sl-calendar-header>
           <IconButton
-            label="Previous month"
+            label={prevButtonProps['aria-label']}
             variant="tertiary"
             disabled={prevButtonProps.isDisabled}
-            aria-label={prevButtonProps['aria-label']}
             onClick={prevButtonProps.onPress as any}
             onFocus={prevButtonProps.onFocusChange as any}
           >
@@ -42,10 +41,9 @@ export function Calendar(props: CalendarProps) {
           </IconButton>
           <h2 data-sl-calendar-title>{title}</h2>
           <IconButton
-            label="Next month"
+            label={nextButtonProps['aria-label']}
             variant="tertiary"
             disabled={nextButtonProps.isDisabled}
-            aria-label={nextButtonProps['aria-label']}
             onClick={nextButtonProps.onPress as any}
             onFocus={nextButtonProps.onFocusChange as any}
           >
diff --git a/packages/theme/src/preflight.css b/packages/theme/src/preflight.css
index 3b58fbefd9..abfaf7e818 100644
--- a/packages/theme/src/preflight.css
+++ b/packages/theme/src/preflight.css
@@ -1,4 +1,4 @@
-@layer sl-reset, sl-base, sl-tokens, sl-components, sl-expended-components;
+@layer sl-reset, sl-base, sl-tokens, sl-components, sl-extended-components;
 
 @layer sl-reset {
   *,
diff --git a/packages/utils/package.json b/packages/utils/package.json
index c886ade634..100a4e022c 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -24,6 +24,8 @@
   "dependencies": {
     "csstype": "3.1.2",
     "deepmerge": "4.3.1",
-    "scule": "1.1.1"
+    "scule": "1.1.1",
+    "tiny-invariant": "1.3.1",
+    "tiny-warning": "1.0.3"
   }
 }
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 0a3ade63ec..aeb46c5909 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -27,6 +27,8 @@ import {
   splitByCase,
   upperFirst,
 } from './string-case'
+import { invariant } from './invariant'
+import { warning } from './warning'
 
 export {
   chain,
@@ -59,6 +61,8 @@ export {
   lowerFirst,
   splitByCase,
   upperFirst,
+  invariant,
+  warning,
 }
 
 export * from './css-types'
diff --git a/packages/utils/src/invariant.ts b/packages/utils/src/invariant.ts
new file mode 100644
index 0000000000..f7678f1d17
--- /dev/null
+++ b/packages/utils/src/invariant.ts
@@ -0,0 +1,3 @@
+import invariant from 'tiny-invariant'
+
+export { invariant }
diff --git a/packages/utils/src/warning.ts b/packages/utils/src/warning.ts
new file mode 100644
index 0000000000..33d24a90bd
--- /dev/null
+++ b/packages/utils/src/warning.ts
@@ -0,0 +1,3 @@
+import warning from 'tiny-warning'
+
+export { warning }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 05ef58c561..9181a5882a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -536,6 +536,12 @@ importers:
       scule:
         specifier: 1.1.1
         version: 1.1.1
+      tiny-invariant:
+        specifier: 1.3.1
+        version: 1.3.1
+      tiny-warning:
+        specifier: 1.0.3
+        version: 1.0.3
 
 packages: