diff --git a/components/auth/LoginView.tsx b/components/auth/LoginView.tsx
index 35ff98f66..5e513deb9 100644
--- a/components/auth/LoginView.tsx
+++ b/components/auth/LoginView.tsx
@@ -38,6 +38,7 @@ const LoginView: FC<Props> = () => {
     } catch ({ errors }) {
       setMessage(errors[0].message)
       setLoading(false)
+      setDisabled(false)
     }
   }
 
diff --git a/components/product/ProductCard/ProductCard.tsx b/components/product/ProductCard/ProductCard.tsx
index 39c19db00..95f2f3f07 100644
--- a/components/product/ProductCard/ProductCard.tsx
+++ b/components/product/ProductCard/ProductCard.tsx
@@ -7,6 +7,7 @@ import Image, { ImageProps } from 'next/image'
 import WishlistButton from '@components/wishlist/WishlistButton'
 import usePrice from '@framework/product/use-price'
 import ProductTag from '../ProductTag'
+
 interface Props {
   className?: string
   product: Product
@@ -23,7 +24,6 @@ const ProductCard: FC<Props> = ({
   className,
   noNameTag = false,
   variant = 'default',
-  ...props
 }) => {
   const { price } = usePrice({
     amount: product.price.value,
@@ -38,7 +38,7 @@ const ProductCard: FC<Props> = ({
   )
 
   return (
-    <Link href={`/product/${product.slug}`} {...props}>
+    <Link href={`/product/${product.slug}`}>
       <a className={rootClassName}>
         {variant === 'slim' && (
           <>
diff --git a/framework/bigcommerce/api/utils/parse-item.ts b/framework/bigcommerce/api/utils/parse-item.ts
index 14c9ac53d..bb59a6ec4 100644
--- a/framework/bigcommerce/api/utils/parse-item.ts
+++ b/framework/bigcommerce/api/utils/parse-item.ts
@@ -10,7 +10,7 @@ type BCCartItemBody = {
   product_id: number
   variant_id: number
   quantity?: number
-  option_selections?: OptionSelections
+  option_selections?: OptionSelections[]
 }
 
 export const parseWishlistItem = (
diff --git a/framework/bigcommerce/auth/use-login.tsx b/framework/bigcommerce/auth/use-login.tsx
index 3ebacc9b7..d366b5260 100644
--- a/framework/bigcommerce/auth/use-login.tsx
+++ b/framework/bigcommerce/auth/use-login.tsx
@@ -16,7 +16,7 @@ export const handler: MutationHook<LoginHook> = {
     if (!(email && password)) {
       throw new CommerceError({
         message:
-          'A first name, last name, email and password are required to login',
+          'An email and password are required to login',
       })
     }
 
diff --git a/framework/bigcommerce/lib/normalize.ts b/framework/bigcommerce/lib/normalize.ts
index cd1c3ce5a..82a22de00 100644
--- a/framework/bigcommerce/lib/normalize.ts
+++ b/framework/bigcommerce/lib/normalize.ts
@@ -10,7 +10,7 @@ function normalizeProductOption(productOption: any) {
   const {
     node: {
       entityId,
-      values: { edges },
+      values: { edges = [] } = {},
       ...rest
     },
   } = productOption
diff --git a/framework/bigcommerce/types/cart.ts b/framework/bigcommerce/types/cart.ts
index 83076ea09..33c01e4c6 100644
--- a/framework/bigcommerce/types/cart.ts
+++ b/framework/bigcommerce/types/cart.ts
@@ -40,7 +40,7 @@ export type OptionSelections = {
 
 export type CartItemBody = Core.CartItemBody & {
   productId: string // The product id is always required for BC
-  optionSelections?: OptionSelections
+  optionSelections?: OptionSelections[]
 }
 
 export type CartTypes = {
diff --git a/framework/shopify/auth/use-login.tsx b/framework/shopify/auth/use-login.tsx
index d4369b7c2..e1de89c99 100644
--- a/framework/shopify/auth/use-login.tsx
+++ b/framework/shopify/auth/use-login.tsx
@@ -22,7 +22,7 @@ export const handler: MutationHook<LoginHook> = {
     if (!(email && password)) {
       throw new CommerceError({
         message:
-          'A first name, last name, email and password are required to login',
+          'An email and password are required to login',
       })
     }