diff --git a/apps/spa/src/components/ProductCard.tsx b/apps/spa/src/components/ProductCard.tsx
index 5740773..458fae1 100644
--- a/apps/spa/src/components/ProductCard.tsx
+++ b/apps/spa/src/components/ProductCard.tsx
@@ -43,7 +43,7 @@ export default function ProductCard({ product, enableQuickShop = false, category
   const { addToCart } = useCartStore();
   const { i18n, t } = useTranslation();
   const isWished = isInWishlist(product.id);
-  const [selectedVariant, setSelectedVariant] = useState(product.variants?.[0] || null);
+  const [selectedVariant, _setSelectedVariant] = useState(product.variants?.[0] || null);
   const displayName = resolveStr(product.name, i18n.language) || (product.brand ? product.brand.name : '');
   const displayCategoryName = categoryNameOverride || resolveStr(product.category.name, i18n.language);
 
diff --git a/apps/spa/src/components/sections/AccordionSection.tsx b/apps/spa/src/components/sections/AccordionSection.tsx
index e7ee6c7..3b6906f 100644
--- a/apps/spa/src/components/sections/AccordionSection.tsx
+++ b/apps/spa/src/components/sections/AccordionSection.tsx
@@ -29,7 +29,7 @@ export default function AccordionSection({ payload }: AccordionSectionProps) {
             {title}
           </h2>
         )}
-        {payload.categories.map((category, catIndex) => (
+        {(payload.categories ?? []).map((category, catIndex) => (
           <div key={catIndex} className="mb-12 last:mb-0">
             <h3 className="mb-6 flex items-center gap-3 font-serif text-2xl">
               {category.icon && (
diff --git a/packages/types/index.ts b/packages/types/index.ts
index bf42c70..dd8b36a 100644
--- a/packages/types/index.ts
+++ b/packages/types/index.ts
@@ -409,10 +409,19 @@ export type ProductCarouselSectionPayload = z.infer<typeof ProductCarouselSectio
 
 // Aliases for backwards compatibility in ScentGuideSectionSchema
 export const HeroArticlePayloadSchema = HeroArticleSectionPayloadSchema;
-export const RichTextPayloadSchema = RichTextSectionPayloadSchema;
+export type HeroArticlePayload = HeroArticleSectionPayload;
+
 export const ScentNotesBreakdownPayloadSchema = ScentNotesBreakdownSectionPayloadSchema;
+export type ScentNotesBreakdownPayload = ScentNotesBreakdownSectionPayload;
+
 export const QuoteCalloutPayloadSchema = QuoteCalloutSectionPayloadSchema;
+export type QuoteCalloutPayload = QuoteCalloutSectionPayload;
+
 export const ProductCarouselPayloadSchema = ProductCarouselSectionPayloadSchema;
+export type ProductCarouselPayload = ProductCarouselSectionPayload;
+
+export const RichTextPayloadSchema = RichTextSectionPayloadSchema;
+export type RichTextPayload = RichTextSectionPayload;
 
 export const ScentGuideSectionSchema = z.discriminatedUnion("type", [
   z.object({