diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index e841d8849..90c1adf98 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -1008,15 +1008,15 @@ export default {
         salesTax() {
             if (!this.lineItems || this.lineItems.length < 1) return;
             return this.isInsurance || !this.shouldHideRecalibration
-                ? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order)
-                : baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal
+                ? baseMixin.methods.getSalesTax(this.lineItems) // calculate with recal (if on order)
+                : baseMixin.methods.getSalesTax(this.lineItemsWithoutRecal); // calculated without recal
         },
         amountDue() {
             if (!this.lineItems || this.lineItems.length < 1) return;
             if (this.showAsPaid) return 0;
             return this.isInsurance || !this.shouldHideRecalibration
-                ? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order)
-                : baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal
+                ? baseMixin.methods.getAmountDue(this.lineItems) // calculate with recal (if on order)
+                : baseMixin.methods.getAmountDue(this.lineItemsWithoutRecal); // calculated without recal
         },
         amountPaid() {
             if (!this.showAsPaid) {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 85fb84a63..ff7e6a8d8 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -666,7 +666,7 @@ export default {
                     return true;
                 }
             } else {
-                if (this.isPiaEnabled && this.totalAmountDue > 0 && !this.isRecalibrationOnOrder) {
+                if (this.isPiaEnabled && this.totalAmountDue > 0 && !this.shouldHideRecalibration) {
                     return true;
                 }
             }
diff --git a/src/store/index.js b/src/store/index.js
index b0037bc61..8a87018d6 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2422,10 +2422,9 @@ export const actions = {
         }));
 
         const order = context.getters.order;
-
-        var providerNumber =
-            order.serviceLocation?.provider?.providerNumber ?? order.serviceLocation?.zipCodeCtu;
-        if (providerNumber.startsWith("00")) {
+        
+        var providerNumber = order.serviceLocation?.provider?.providerNumber ?? order.serviceLocation?.zipCodeCtu;
+        if (providerNumber.startsWith("00") && providerNumber.length > 5) {
             providerNumber = providerNumber.substring(1);
         }