diff --git a/packages/@react-spectrum/s2/src/Image.tsx b/packages/@react-spectrum/s2/src/Image.tsx
index 7e8f875099d..246a98106ce 100644
--- a/packages/@react-spectrum/s2/src/Image.tsx
+++ b/packages/@react-spectrum/s2/src/Image.tsx
@@ -228,7 +228,7 @@ export const Image = forwardRef(function Image(props: ImageProps, domRef: Forwar
       {!errorState && (
         <img
           {...getFetchPriorityProp(fetchPriority)}
-          src={src}
+          src={src || undefined}
           alt={alt}
           crossOrigin={crossOrigin}
           decoding={decoding}
diff --git a/packages/@react-spectrum/s2/src/Skeleton.tsx b/packages/@react-spectrum/s2/src/Skeleton.tsx
index c74c9f33ef4..de5673602ec 100644
--- a/packages/@react-spectrum/s2/src/Skeleton.tsx
+++ b/packages/@react-spectrum/s2/src/Skeleton.tsx
@@ -126,7 +126,8 @@ export function SkeletonWrapper({children}: {children: SkeletonElement}): ReactN
       {isLoading ? cloneElement(children, {
         ref: mergeRefs(childRef, animation),
         className: (children.props.className || '') + ' ' + loadingStyle,
-        inert: 'true'
+        // @ts-ignore - compatibility with React < 19
+        inert: inertValue(true)
       }) : children}
     </SkeletonContext.Provider>
   );
diff --git a/packages/@react-spectrum/s2/stories/CardView.stories.tsx b/packages/@react-spectrum/s2/stories/CardView.stories.tsx
index 3cba3a49c72..16293cd22c7 100644
--- a/packages/@react-spectrum/s2/stories/CardView.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/CardView.stories.tsx
@@ -101,7 +101,8 @@ function PhotoCard({item, layout}: {item: Item, layout: string}) {
   );
 }
 
-export const Example = (args: CardViewProps<any>, {viewMode}) => {
+export const Example = (args: CardViewProps<any> & {viewMode: string}) => {
+  let {viewMode} = args;
   let list = useAsyncList<Item, number | null>({
     async load({signal, cursor, items}) {
       let page = cursor || 1;
@@ -154,10 +155,14 @@ export const Example = (args: CardViewProps<any>, {viewMode}) => {
 Example.args = {
   loadingState: 'idle',
   onAction: null,
-  selectionMode: 'multiple'
+  selectionMode: 'multiple',
+  decorators: [
+    (Story, {viewMode}) => <Story viewMode={viewMode} />
+  ]
 };
 
-export const Empty = (args: CardViewProps<any>, {viewMode}) => {
+export const Empty = (args: CardViewProps<any> & {viewMode: string}) => {
+  let {viewMode} = args;
   return (
     <CardView
       aria-label="Assets"
@@ -175,6 +180,12 @@ export const Empty = (args: CardViewProps<any>, {viewMode}) => {
   );
 };
 
+Empty.args = {
+  decorators: [
+    (Story, {viewMode}) => <Story viewMode={viewMode} />
+  ]
+};
+
 interface Topic {
   id: string,
   title: string,
@@ -202,7 +213,8 @@ function TopicCard({topic}: {topic: Topic}) {
   );
 }
 
-export const CollectionCards = (args: CardViewProps<any>, {viewMode}) => {
+export const CollectionCards = (args: CardViewProps<any> & {viewMode: string}) => {
+  let {viewMode} = args;
   let list = useAsyncList<Topic, number | null>({
     async load({signal, cursor}) {
       let page = cursor || 1;
@@ -253,5 +265,8 @@ export const CollectionCards = (args: CardViewProps<any>, {viewMode}) => {
 
 CollectionCards.args = {
   loadingState: 'idle',
-  onAction: null
+  onAction: null,
+  decorators: [
+    (Story, {viewMode}) => <Story viewMode={viewMode} />
+  ]
 };
diff --git a/packages/react-aria-components/src/Tabs.tsx b/packages/react-aria-components/src/Tabs.tsx
index 0f12c0a6140..dea9b90c12c 100644
--- a/packages/react-aria-components/src/Tabs.tsx
+++ b/packages/react-aria-components/src/Tabs.tsx
@@ -300,7 +300,8 @@ export const TabPanel = /*#__PURE__*/ createHideableComponent(function TabPanel(
     values: {
       isFocused,
       isFocusVisible,
-      isInert: !isSelected,
+      // @ts-ignore - compatibility with React < 19
+      isInert: inertValue(!isSelected),
       state
     }
   });