diff --git a/src/components/ui/native-select.tsx b/src/components/ui/native-select.tsx
index 97f7b33a9..5cfac9a66 100644
--- a/src/components/ui/native-select.tsx
+++ b/src/components/ui/native-select.tsx
@@ -59,13 +59,14 @@ const NATIVE_SELECT_CLASS =
 
 export type NativeSelectProps = React.SelectHTMLAttributes<HTMLSelectElement>;
 
-export const NativeSelect = React.forwardRef<
-  HTMLSelectElement,
-  NativeSelectProps
->(function NativeSelect({ className, children, style, ...props }, ref) {
+export function NativeSelect({
+  className,
+  children,
+  style,
+  ...props
+}: NativeSelectProps) {
   return (
     <select
-      ref={ref}
       data-slot="native-select"
       className={cn(NATIVE_SELECT_CLASS, className)}
       style={style}
@@ -74,4 +75,4 @@ export const NativeSelect = React.forwardRef<
       {children}
     </select>
   );
-});
+}
diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
index d5c37b20f..5c0f9d8dc 100644
--- a/src/components/ui/textarea.tsx
+++ b/src/components/ui/textarea.tsx
@@ -39,13 +39,13 @@ import { cn } from "@/lib/utils";
  * Composition is via `cn(…)` so callers can override anything — the
  * primitive defaults are the strict pass, not the only pass.
  */
-const Textarea = React.forwardRef<
-  HTMLTextAreaElement,
-  React.ComponentProps<"textarea">
->(function Textarea(
-  { className, autoComplete, autoCapitalize, spellCheck, ...props },
-  ref,
-) {
+function Textarea({
+  className,
+  autoComplete,
+  autoCapitalize,
+  spellCheck,
+  ...props
+}: React.ComponentProps<"textarea">) {
   const resolvedAutoComplete = autoComplete ?? "off";
   const resolvedAutoCapitalize = autoCapitalize ?? "sentences";
   const resolvedSpellCheck = spellCheck ?? true;
@@ -53,7 +53,6 @@ const Textarea = React.forwardRef<
 
   return (
     <textarea
-      ref={ref}
       data-slot="textarea"
       autoComplete={resolvedAutoComplete}
       autoCapitalize={resolvedAutoCapitalize}
@@ -71,6 +70,6 @@ const Textarea = React.forwardRef<
       {...props}
     />
   );
-});
+}
 
 export { Textarea };
diff --git a/src/lib/medications/inventory/consumption.ts b/src/lib/medications/inventory/consumption.ts
index 7b3319e85..cc89e278b 100644
--- a/src/lib/medications/inventory/consumption.ts
+++ b/src/lib/medications/inventory/consumption.ts
@@ -34,6 +34,7 @@
  */
 
 import { Prisma, type PrismaClient } from "@/generated/prisma/client";
+import { toJson } from "@/lib/db";
 import { annotate } from "@/lib/logging/context";
 import {
   computeExpiresAt,
@@ -263,7 +264,7 @@ export async function consumeForIntake(input: {
       // registered later when a sync replay revisits the row.
       await tx.medicationIntakeEvent.update({
         where: { id: eventId },
-        data: { inventoryConsumption: stamp as unknown as Prisma.InputJsonValue },
+        data: { inventoryConsumption: toJson(stamp) },
       });
 
       annotate({