diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-create/components/create-inventory-item-form/create-inventory-availability-form.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-create/components/create-inventory-item-form/create-inventory-availability-form.tsx
index 326643d242..0752f44436 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-create/components/create-inventory-item-form/create-inventory-availability-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-create/components/create-inventory-item-form/create-inventory-availability-form.tsx
@@ -48,7 +48,7 @@ const useColumns = () => {
             <DataGridReadOnlyCell>{row.original.name}</DataGridReadOnlyCell>
           )
         },
-        disableHidding: true,
+        disableHiding: true,
       }),
       columnHelper.column({
         id: "in-stock",
@@ -64,6 +64,7 @@ const useColumns = () => {
             />
           )
         },
+        disableHiding: true,
       }),
     ],
     [t]
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-general-section.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-general-section.tsx
index 8eb1328f85..cbdcbaa785 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-general-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-general-section.tsx
@@ -59,6 +59,7 @@ export const InventoryItemGeneralSection = ({
 }
 
 const getQuantityFormat = (quantity: number, locations?: number) => {
-  return `${quantity ?? "-"}
-   ${quantity ? `across ${locations ?? "-"} locations` : ""}`
+  return `${quantity ?? "-"} ${
+    quantity ? `across ${locations ?? "-"} locations` : ""
+  }`
 }
diff --git a/packages/admin-next/dashboard/src/routes/locations/location-detail/components/location-general-section/location-general-section.tsx b/packages/admin-next/dashboard/src/routes/locations/location-detail/components/location-general-section/location-general-section.tsx
index af81f95492..eb16064917 100644
--- a/packages/admin-next/dashboard/src/routes/locations/location-detail/components/location-general-section/location-general-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/locations/location-detail/components/location-general-section/location-general-section.tsx
@@ -411,7 +411,7 @@ function ServiceZone({ zone, locationId, fulfillmentSetId }: ServiceZoneProps) {
                   {
                     label: t("stockLocations.serviceZones.manageAreas.action"),
                     icon: <Map />,
-                    to: `/settings/locations/${locationId}/fulfillment-set/${fulfillmentSetId}/service-zone/${zone.id}/edit-areas`,
+                    to: `/settings/locations/${locationId}/fulfillment-set/${fulfillmentSetId}/service-zone/${zone.id}/areas`,
                   },
                 ],
               },
diff --git a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/components/manage-variant-inventory-items-form/manage-variant-inventory-items-form.tsx b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/components/manage-variant-inventory-items-form/manage-variant-inventory-items-form.tsx
index 7f79cf2f55..35321c9ba4 100644
--- a/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/components/manage-variant-inventory-items-form/manage-variant-inventory-items-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/product-variants/product-variant-manage-inventory-items/components/manage-variant-inventory-items-form/manage-variant-inventory-items-form.tsx
@@ -16,6 +16,7 @@ import {
 import { useProductVariantsInventoryItemsBatch } from "../../../../../hooks/api/products"
 import { useComboboxData } from "../../../../../hooks/use-combobox-data"
 import { sdk } from "../../../../../lib/client"
+import { useEffect } from "react"
 
 type ManageVariantInventoryItemsFormProps = {
   variant: AdminProductVariant & {
@@ -53,10 +54,17 @@ export function ManageVariantInventoryItemsForm({
 
   const form = useForm<zod.infer<typeof ManageVariantInventoryItemsSchema>>({
     defaultValues: {
-      inventory: variant.inventory_items!.map((i) => ({
-        required_quantity: i.required_quantity,
-        inventory_item_id: i.inventory.id,
-      })),
+      inventory: variant.inventory_items.length
+        ? variant.inventory_items!.map((i) => ({
+            required_quantity: i.required_quantity,
+            inventory_item_id: i.inventory.id,
+          }))
+        : [
+            {
+              inventory_item_id: "",
+              required_quantity: "",
+            },
+          ],
     },
     resolver: zodResolver(ManageVariantInventoryItemsSchema),
   })
diff --git a/packages/admin-next/dashboard/src/routes/products/common/variant-pricing-form.tsx b/packages/admin-next/dashboard/src/routes/products/common/variant-pricing-form.tsx
index f0c81af0f7..1e55bef829 100644
--- a/packages/admin-next/dashboard/src/routes/products/common/variant-pricing-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/common/variant-pricing-form.tsx
@@ -97,11 +97,16 @@ export const useVariantPriceGridColumns = ({
         return columnHelper.display({
           header: `Price ${region.name}`,
           cell: ({ row, table }) => {
+            const currency = currencies.find(
+              (c) => c.code === region.currency_code
+            )
+
+            if (!currency) {
+              return null
+            }
             return (
               <CurrencyCell
-                currency={currencies.find(
-                  (c) => c.code === region.currency_code
-                )}
+                currency={currency}
                 meta={table.options.meta as DataGridMeta}
                 field={`variants.${row.index}.prices.${region.id}`}
               />
diff --git a/packages/admin-next/dashboard/src/routes/products/product-detail/components/product-variant-section/use-variant-table-columns.tsx b/packages/admin-next/dashboard/src/routes/products/product-detail/components/product-variant-section/use-variant-table-columns.tsx
index bb6e8419de..9813776ebe 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-detail/components/product-variant-section/use-variant-table-columns.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-detail/components/product-variant-section/use-variant-table-columns.tsx
@@ -124,10 +124,11 @@ export const useProductVariantTableColumns = (
           }
 
           return (
-            <div className="flex h-full w-full items-center overflow-hidden">
+            <div className="flex items-center">
               <Badge
                 size="2xsmall"
-                className="flex min-w-[20px] items-center justify-center"
+                title={variantOpt.value}
+                className="inline-block min-w-[20px] max-w-[140px] overflow-hidden truncate"
               >
                 {variantOpt.value}
               </Badge>
diff --git a/packages/admin-next/dashboard/src/routes/products/product-prices/pricing-edit.tsx b/packages/admin-next/dashboard/src/routes/products/product-prices/pricing-edit.tsx
index fb4f4aca73..30f12ef473 100644
--- a/packages/admin-next/dashboard/src/routes/products/product-prices/pricing-edit.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/product-prices/pricing-edit.tsx
@@ -46,7 +46,7 @@ export const PricingEdit = ({
       acc[reg.id] = reg.currency_code
       return acc
     }, {})
-  }, regions)
+  }, [regions])
 
   const variants = variantId
     ? product.variants.filter((v) => v.id === variantId)