diff --git a/src/global-methods.js b/src/global-methods.js
index 6afeef53d..22512fe41 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -6,6 +6,7 @@ import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
 import { GaCategories, GaActions, GaLabels } from "@/constants/analytics";
+import { getSessionKeyValue } from "@/helpers/heritage-integration/cookie-helper";
 import { headerKeys } from "@/constants/header-keys";
 import axiosResponseInterceptorMessages from "@/constants/axios-response-interceptor-messages.js";
 
@@ -65,7 +66,7 @@ export default {
             const headers = {
                 [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings),
                 [headerKeys.APPLICATION_NAME]: applicationConfig.APPLICATION_NAME,
-                [headerKeys.SESSION_SEQUENCE_NUMBER]: store.getters.applicationUser?.savedSessionId,
+                [headerKeys.SESSION_SEQUENCE_NUMBER]: getSessionKeyValue(),
                 [headerKeys.REFERRAL_SEQUENCE_NUMBER]: order?.referralSequenceNumber,
                 [headerKeys.TRANSACTION_ID]: crypto.randomUUID(),
                 [headerKeys.EON]: order?.eon,
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 00687155b..e510959db 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -134,6 +134,8 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
     }
 
     if (
+        (process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglasstest") &&
+            process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") ||
         (process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglassdev") &&
             process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") ||
         (process.env.VUE_APP_HERITAGE_FUNNEL.includes("localhost") &&
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 9f8cee9ec..194243d38 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -36,7 +36,7 @@
                         :showInsuranceCoverageAs="showInsuranceCoverageAs"
                         :shouldHideRecalibration="shouldHideRecalibration"
                         :isItac="isItac"
-                        :isNocomp="isNocomp" />
+                        :isNoComp="isNoComp" />
 
                     <hr class="my-5" />
 
diff --git a/src/store/index.js b/src/store/index.js
index 65c1d64d4..d744175c9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -810,8 +810,11 @@ export const getters = {
         return false;
     },
     shouldHideRecalibration: (state) => {
-        return (experimentMixin.methods.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)
-        ?.toLowerCase() === "true" && getters.isRecalibrationOnOrder);
+        return (
+            experimentMixin.methods
+                .getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)
+                ?.toLowerCase() === "true" && getters.isRecalibrationOnOrder
+        );
     },
     areRearWipersOnOrder: (state) => {
         return !!state.order.lineItems.vaps?.some(
@@ -2622,6 +2625,7 @@ export const actions = {
                 carId: order.vehicle.carId,
                 correlationId: order.referralCorrelationId,
                 eon: order.eon,
+                isInsurance: order.payment.isInsurance,
                 isRepair: order.damage.isRepair,
                 glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace),
                 lineItemsOnOrder: getArrayOfAllLineItemsAndChildParts(lineItemsToUse),
@@ -2694,6 +2698,7 @@ export const actions = {
                 carId: order.vehicle.carId,
                 correlationId: order.referralCorrelationId,
                 eon: order.eon,
+                isInsurance: order.payment.isInsurance,
                 isRepair: order.damage.isRepair,
                 glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace),
                 lineItemsOnOrder: getArrayOfAllLineItemsAndChildParts(lineItemsToUse),