diff --git a/.circleci/config.yml b/.circleci/config.yml
index c2b8ad22988..953bf7bb03c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -380,6 +380,8 @@ jobs:
       - run:
           name: build fork-point apis
           command: |
+            mkdir -p ~/.ssh
+            curl -L https://api.github.com/meta | jq -r '.ssh_keys | .[]' | sed -e 's/^/github.com /' >> ~/.ssh/known_hosts
             yarn build:api-branch --githash="origin/main" --output="base-api" && yarn build:api-branch && yarn compare:apis
 
       - persist_to_workspace:
diff --git a/package.json b/package.json
index 9bedcbadf33..f77ecdaec3e 100644
--- a/package.json
+++ b/package.json
@@ -274,8 +274,5 @@
         ]
       }
     ]
-  },
-  "locales": [
-    "en-US"
-  ]
+  }
 }
diff --git a/packages/dev/s2-docs/pages/s2/DateField.mdx b/packages/dev/s2-docs/pages/s2/DateField.mdx
index 9d88a4e60a8..f20afb4c5b0 100644
--- a/packages/dev/s2-docs/pages/s2/DateField.mdx
+++ b/packages/dev/s2-docs/pages/s2/DateField.mdx
@@ -32,7 +32,7 @@ import {useState} from 'react';
 function Example() {
   let [date, setDate] = useState(parseDate('2020-02-03'));
   let formatter = useDateFormatter({ dateStyle: 'full' });
-  
+
   return (
     <>
       <DateField
diff --git a/packages/dev/s2-docs/src/VisualExampleClient.tsx b/packages/dev/s2-docs/src/VisualExampleClient.tsx
index f44ce3361ae..9c1e9f85643 100644
--- a/packages/dev/s2-docs/src/VisualExampleClient.tsx
+++ b/packages/dev/s2-docs/src/VisualExampleClient.tsx
@@ -1018,8 +1018,8 @@ function PlacementControl({control, value, onChange}) {
             "sb .  .  .  eb"
             ".  bs bc be . "
           `,
-          gridTemplateColumns: '25px 24px 24px 25px 24px',
-          gridTemplateRows: '25px 24px 24px 25px 24px'
+          gridTemplateColumns: 'calc(25px * var(--s2-scale)) calc(24px * var(--s2-scale)) calc(24px * var(--s2-scale)) calc(25px * var(--s2-scale)) calc(24px * var(--s2-scale))',
+          gridTemplateRows: 'calc(25px * var(--s2-scale)) calc(24px * var(--s2-scale)) calc(24px * var(--s2-scale)) calc(25px * var(--s2-scale)) calc(24px * var(--s2-scale))'
         }}>
         <PlacementControlItem id="top start" style={{gridArea: 'ts'}} />
         <PlacementControlItem id="top" style={{gridArea: 'tc'}} />
diff --git a/starters/docs/src/DateField.css b/starters/docs/src/DateField.css
index 4d78ed363aa..bd77ef98d74 100644
--- a/starters/docs/src/DateField.css
+++ b/starters/docs/src/DateField.css
@@ -20,6 +20,8 @@
   white-space: nowrap;
   forced-color-adjust: none;
   cursor: text;
+  overflow-x: auto;
+  scrollbar-width: none;
 
   &[data-focus-within] {
     outline: 2px solid var(--focus-ring-color);
diff --git a/starters/tailwind/src/DateField.tsx b/starters/tailwind/src/DateField.tsx
index 24d16712e79..6b5dd4da5bf 100644
--- a/starters/tailwind/src/DateField.tsx
+++ b/starters/tailwind/src/DateField.tsx
@@ -49,7 +49,7 @@ const segmentStyles = tv({
 
 export function DateInput(props: Omit<DateInputProps, 'children'>) {
   return (
-    <AriaDateInput className={renderProps => fieldGroupStyles({...renderProps, class: 'block min-w-[150px] px-2 py-1.5 text-sm font-sans'})} {...props}>
+    <AriaDateInput className={renderProps => fieldGroupStyles({...renderProps, class: 'inline min-w-[150px] px-2 py-1.5 text-sm font-sans whitespace-nowrap overflow-x-auto [scrollbar-width:none]'})} {...props}>
       {(segment) => <DateSegment segment={segment} className={segmentStyles} />}
     </AriaDateInput>
   );