diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 217f68c60..8e0befe51 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -96,7 +96,7 @@ exports.default = async (req, res) => {
           count: autoHouseObject.AutoHouseExport.RepairOrder.length,
           xml: ret,
           filename: `IM_${bodyshop.autohouseid}_${moment().format(
-            "DDMMYYYY_HHMMSS"
+            "DDMMYYYY_HHMMss"
           )}.xml`,
         });
 
@@ -328,8 +328,12 @@ const CreateRepairOrderTag = (job, errorCallback) => {
               .format(AhDateFormat)) ||
           "",
         DeliveryAppointmentDate:
-          (job.scheduled_delivery &&
-            moment(job.scheduled_delivery)
+          // (job.scheduled_delivery &&
+          //   moment(job.scheduled_delivery)
+          //     .tz(job.bodyshop.timezone)
+          //     .format(AhDateFormat)) ||
+          (job.scheduled_completion &&
+            moment(job.scheduled_completion)
               .tz(job.bodyshop.timezone)
               .format(AhDateFormat)) ||
           "",
@@ -538,7 +542,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         ),
         GlassLaborTotalCost:
           repairCosts.GlassLaborTotalCost.toFormat(AHDineroFormat),
-        DetailLaborTotal: Dinero(job.job_totals.rates.lag.total).toFormat(
+        DetailLaborTotal: Dinero(job.job_totals.rates.lad.total).toFormat(
           AHDineroFormat
         ),
         DetailLaborTotalCost:
@@ -590,7 +594,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           AHDineroFormat
         ),
         InsurancePay: Dinero(job.job_totals.totals.total_repairs)
-          .subtract(Dinero(job.job_totals.totals.custPayable))
+          .subtract(Dinero(job.job_totals.totals.custPayable.total))
           .toFormat(AHDineroFormat),
         Deposit: 0,
         AmountDue: 0,