diff --git a/client/src/components/job-bills-total/job-bills-total.component.jsx b/client/src/components/job-bills-total/job-bills-total.component.jsx
index 3646c4885..ad659b9f6 100644
--- a/client/src/components/job-bills-total/job-bills-total.component.jsx
+++ b/client/src/components/job-bills-total/job-bills-total.component.jsx
@@ -118,7 +118,7 @@ export default function JobBillsTotalComponent({
         <Statistic
           title={t("bills.labels.totalreturns")}
           value={totalReturns.toFormat()}
-        />{" "}
+        />
         <Statistic
           title={t("bills.labels.creditsreceived")}
           value={billCms.toFormat()}
diff --git a/client/src/components/jobs-available-table/jobs-available-table.component.jsx b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
index 3946eefde..05291603a 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.component.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
@@ -133,7 +133,7 @@ export default function JobsAvailableComponent({
       title: t("general.labels.actions"),
       key: "actions",
       render: (text, record) => (
-        <Space>
+        <Space wrap>
           <Button
             onClick={() => {
               deleteJob({ variables: { id: record.id } }).then((r) => {
diff --git a/server/job/job-totals.js b/server/job/job-totals.js
index 6e605d19d..f17a32e5c 100644
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -352,7 +352,9 @@ function CalculateTaxesTotals(job, otherTotals) {
               ((job.parts_tax_rates &&
                 job.parts_tax_rates[val.part_type] &&
                 job.parts_tax_rates[val.part_type].prt_tax_rt) ||
-                (val.part_type.startsWith("PAG") &&
+                (val.part_type &&
+                  val.part_type.startsWith("PAG") &&
+                  BackupGlassTax &&
                   BackupGlassTax.prt_tax_rt) ||
                 0) * 100
             )