diff --git a/package.json b/package.json
index 04d24cdc9..3910fdddf 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "scripts": {
     "predev": "agility-next sync",
-    "dev": "NODE_OPTIONS='--inspect' next dev",
+    "dev": "next dev",
     "prebuild": "agility-next prebuild",
     "build": "next build",
     "export": "next export",
diff --git a/pages/api/search-products.ts b/pages/api/search-products.ts
index 9cea4ee43..e4ade8651 100644
--- a/pages/api/search-products.ts
+++ b/pages/api/search-products.ts
@@ -47,11 +47,11 @@ const getProducts = async ({ search, config }: any) => {
 
 	const commerceConfig = commerce.provider.config
 
-	const { data } = await commerceConfig.storeApiFetch<{ data: { id: number }[] }>(
+	const { data } = await commerceConfig.storeApiFetch(
 		url.pathname + url.search
 	)
 
-	const ids = data.map((p) => String(p.id))
+	const ids = data.map((p: any) => String(p.id))
 	const found = ids.length > 0
 
 	// We want the GraphQL version of each product
@@ -61,9 +61,7 @@ const getProducts = async ({ search, config }: any) => {
 	})
 
 	// Put the products in an object that we can use to get them by id
-	const productsById = graphqlData.products.reduce<{
-		[k: string]: Product
-	}>((prods, p) => {
+	const productsById = graphqlData.products.reduce((prods: any, p: any) => {
 		prods[Number(p.id)] = p
 		return prods
 	}, {})
@@ -72,7 +70,7 @@ const getProducts = async ({ search, config }: any) => {
 
 	// Populate the products array with the graphql products, in the order
 	// assigned by the list of entity ids
-	ids.forEach((id) => {
+	ids.forEach((id: any) => {
 		const product = productsById[id]
 		if (product) products.push(product)
 	})
diff --git a/tsconfig.json b/tsconfig.json
index 4bafb3abb..0b71cd09b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -22,13 +22,14 @@
       "@components/*": ["components/*"],
       "@commerce": ["framework/commerce"],
       "@commerce/*": ["framework/commerce/*"],
-      "@framework": ["framework/bigcommerce"],
-      "@framework/*": ["framework/bigcommerce/*"]
+      "@framework": ["framework/local"],
+      "@framework/*": ["framework/local/*"]
     }
   },
   "include": ["next-env.d.ts", "**/*.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"],
   "exclude": [
     "node_modules",
+    "./framework/bigcommerce",
     "./framework/shopify",
     "./framework/swell",
     "./framework/vendure",