diff --git a/components/product/ProductSlider/ProductSlider.tsx b/components/product/ProductSlider/ProductSlider.tsx
index b8a405d41..3b7b3adde 100644
--- a/components/product/ProductSlider/ProductSlider.tsx
+++ b/components/product/ProductSlider/ProductSlider.tsx
@@ -1,4 +1,4 @@
-import { useKeenSlider } from 'keen-slider/react'
+import { useKeenSlider } from 'keen-slider/react.esm.js'
 import React, {
   Children,
   FC,
diff --git a/components/product/Swatch/Swatch.module.css b/components/product/Swatch/Swatch.module.css
index fca37968f..6d50fd720 100644
--- a/components/product/Swatch/Swatch.module.css
+++ b/components/product/Swatch/Swatch.module.css
@@ -1,6 +1,6 @@
 .swatch {
   box-sizing: border-box;
-  composes: root from 'components/ui/Button/Button.module.css';
+  composes: root from '@components/ui/Button/Button.module.css';
   @apply h-10 w-10 bg-primary text-primary rounded-full mr-3 inline-flex
   items-center justify-center cursor-pointer transition duration-150 ease-in-out
   p-0 shadow-none border-gray-200 border box-border;
diff --git a/framework/swell/common/get-site-info.ts b/framework/swell/common/get-site-info.ts
index c7a06c52e..a6b8aa46a 100644
--- a/framework/swell/common/get-site-info.ts
+++ b/framework/swell/common/get-site-info.ts
@@ -19,8 +19,10 @@ const getSiteInfo = async (options?: {
 
   config = getConfig(config)
 
-  const categories = await getCategories(config)
-  const brands = await getVendors(config)
+  const categoriesPromise = getCategories(config)
+  const brandsPromise = getVendors(config)
+  const categories = await categoriesPromise
+  const brands = await brandsPromise
 
   return {
     categories,
diff --git a/pages/[...pages].tsx b/pages/[...pages].tsx
index c63963ef6..9e564a50b 100644
--- a/pages/[...pages].tsx
+++ b/pages/[...pages].tsx
@@ -16,8 +16,10 @@ export async function getStaticProps({
   locales,
 }: GetStaticPropsContext<{ pages: string[] }>) {
   const config = { locale, locales }
-  const { pages } = await commerce.getAllPages({ config, preview })
-  const { categories } = await commerce.getSiteInfo({ config, preview })
+  const pagesPromise = commerce.getAllPages({ config, preview })
+  const siteInfoPromise = commerce.getSiteInfo({ config, preview })
+  const { pages } = await pagesPromise
+  const { categories } = await siteInfoPromise
   const path = params?.pages.join('/')
   const slug = locale ? `${locale}/${path}` : path
   const pageItem = pages.find((p) => (p.url ? getSlug(p.url) === slug : false))
diff --git a/pages/cart.tsx b/pages/cart.tsx
index d01664873..c0b15dfd5 100644
--- a/pages/cart.tsx
+++ b/pages/cart.tsx
@@ -13,8 +13,10 @@ export async function getStaticProps({
   locales,
 }: GetStaticPropsContext) {
   const config = { locale, locales }
-  const { pages } = await commerce.getAllPages({ config, preview })
-  const { categories } = await commerce.getSiteInfo({ config, preview })
+  const pagesPromise = commerce.getAllPages({ config, preview })
+  const siteInfoPromise = commerce.getSiteInfo({ config, preview })
+  const { pages } = await pagesPromise
+  const { categories } = await siteInfoPromise
   return {
     props: { pages, categories },
   }
diff --git a/pages/index.tsx b/pages/index.tsx
index 004c5e72a..4f741bb90 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -16,8 +16,10 @@ export async function getStaticProps({
     config,
     preview,
   })
-  const { categories, brands } = await commerce.getSiteInfo({ config, preview })
-  const { pages } = await commerce.getAllPages({ config, preview })
+  const pagesPromise = commerce.getAllPages({ config, preview })
+  const siteInfoPromise = commerce.getSiteInfo({ config, preview })
+  const { pages } = await pagesPromise
+  const { categories, brands } = await siteInfoPromise
 
   return {
     props: {
diff --git a/pages/orders.tsx b/pages/orders.tsx
index 7a744b2cd..b8b10814b 100644
--- a/pages/orders.tsx
+++ b/pages/orders.tsx
@@ -10,8 +10,10 @@ export async function getStaticProps({
   locales,
 }: GetStaticPropsContext) {
   const config = { locale, locales }
-  const { pages } = await commerce.getAllPages({ config, preview })
-  const { categories } = await commerce.getSiteInfo({ config, preview })
+  const pagesPromise = commerce.getAllPages({ config, preview })
+  const siteInfoPromise = commerce.getSiteInfo({ config, preview })
+  const { pages } = await pagesPromise
+  const { categories } = await siteInfoPromise
 
   return {
     props: { pages, categories },
diff --git a/pages/product/[slug].tsx b/pages/product/[slug].tsx
index f584e5bf4..285b83b18 100644
--- a/pages/product/[slug].tsx
+++ b/pages/product/[slug].tsx
@@ -15,19 +15,22 @@ export async function getStaticProps({
   preview,
 }: GetStaticPropsContext<{ slug: string }>) {
   const config = { locale, locales }
-  const { pages } = await commerce.getAllPages({ config, preview })
-  const { categories } = await commerce.getSiteInfo({ config, preview })
-  const { product } = await commerce.getProduct({
+  const pagesPromise = commerce.getAllPages({ config, preview })
+  const siteInfoPromise = commerce.getSiteInfo({ config, preview })
+  const productPromise = commerce.getProduct({
     variables: { slug: params!.slug },
     config,
     preview,
   })
-
-  const { products: relatedProducts } = await commerce.getAllProducts({
+  const allProductsPromise = commerce.getAllProducts({
     variables: { first: 4 },
     config,
     preview,
   })
+  const { pages } = await pagesPromise
+  const { categories } = await siteInfoPromise
+  const { product } = await productPromise
+  const { products: relatedProducts } = await allProductsPromise
 
   if (!product) {
     throw new Error(`Product with slug '${params!.slug}' not found`)
diff --git a/pages/profile.tsx b/pages/profile.tsx
index 1f575c8f2..eb54004ee 100644
--- a/pages/profile.tsx
+++ b/pages/profile.tsx
@@ -10,8 +10,10 @@ export async function getStaticProps({
   locales,
 }: GetStaticPropsContext) {
   const config = { locale, locales }
-  const { pages } = await commerce.getAllPages({ config, preview })
-  const { categories } = await commerce.getSiteInfo({ config, preview })
+  const pagesPromise = commerce.getAllPages({ config, preview })
+  const siteInfoPromise = commerce.getSiteInfo({ config, preview })
+  const { pages } = await pagesPromise
+  const { categories } = await siteInfoPromise
 
   return {
     props: { pages, categories },
diff --git a/pages/search.tsx b/pages/search.tsx
index 6f98ccd80..cecb8ee62 100644
--- a/pages/search.tsx
+++ b/pages/search.tsx
@@ -36,8 +36,11 @@ export async function getStaticProps({
   locales,
 }: GetStaticPropsContext) {
   const config = { locale, locales }
-  const { pages } = await commerce.getAllPages({ config, preview })
-  const { categories, brands } = await commerce.getSiteInfo({ config, preview })
+  const pagesPromise = commerce.getAllPages({ config, preview })
+  const siteInfoPromise = commerce.getSiteInfo({ config, preview })
+  const { pages } = await pagesPromise
+  const { categories, brands } = await siteInfoPromise
+
   return {
     props: {
       pages,
diff --git a/pages/wishlist.tsx b/pages/wishlist.tsx
index bd558c393..fd28edff4 100644
--- a/pages/wishlist.tsx
+++ b/pages/wishlist.tsx
@@ -20,8 +20,10 @@ export async function getStaticProps({
   }
 
   const config = { locale, locales }
-  const { pages } = await commerce.getAllPages({ config, preview })
-  const { categories } = await commerce.getSiteInfo({ config, preview })
+  const pagesPromise = commerce.getAllPages({ config, preview })
+  const siteInfoPromise = commerce.getSiteInfo({ config, preview })
+  const { pages } = await pagesPromise
+  const { categories } = await siteInfoPromise
 
   return {
     props: {