diff --git a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
index e4acf9286..eec385fca 100644
--- a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
+++ b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
@@ -53,7 +53,7 @@ export function ContractConvertToRo({
     const billingLines = [];
     if (contractLength > 0)
       billingLines.push({
-        manual_line:true,
+        manual_line: true,
         unq_seq: 1,
         line_no: 1,
         line_ref: 1,
@@ -71,7 +71,7 @@ export function ContractConvertToRo({
       contract.kmend - contract.kmstart - contract.dailyfreekm * contractLength;
     if (mileageDiff > 0) {
       billingLines.push({
-        manual_line:true,
+        manual_line: true,
         unq_seq: 2,
         line_no: 2,
         line_ref: 2,
@@ -88,7 +88,7 @@ export function ContractConvertToRo({
 
     if (values.refuelqty > 0) {
       billingLines.push({
-        manual_line:true,
+        manual_line: true,
         unq_seq: 3,
         line_no: 3,
         line_ref: 3,
@@ -104,7 +104,7 @@ export function ContractConvertToRo({
     }
     if (values.applyCleanupCharge) {
       billingLines.push({
-        manual_line:true,
+        manual_line: true,
         unq_seq: 4,
         line_no: 4,
         line_ref: 4,
@@ -121,7 +121,7 @@ export function ContractConvertToRo({
     if (contract.damagewaiver) {
       //Add for cleanup fee.
       billingLines.push({
-        manual_line:true,
+        manual_line: true,
         unq_seq: 5,
         line_no: 5,
         line_ref: 5,
@@ -153,10 +153,10 @@ export function ContractConvertToRo({
       ownr_co_nm: contract.job.owner.ownr_co_nm,
       ownr_ph1: contract.job.owner.ownr_ph1,
       ownr_ea: contract.job.owner.ownr_ea,
-      v_model_desc: contract.job.vehicle.v_model_desc,
-      v_model_yr: contract.job.vehicle.v_model_yr,
-      v_make_desc: contract.job.vehicle.v_make_desc,
-      v_vin: contract.job.vehicle.v_vin,
+      v_model_desc: contract.job.vehicle && contract.job.vehicle.v_model_desc,
+      v_model_yr: contract.job.vehicle && contract.job.vehicle.v_model_yr,
+      v_make_desc: contract.job.vehicle && contract.job.vehicle.v_make_desc,
+      v_vin: contract.job.vehicle && contract.job.vehicle.v_vin,
       status: bodyshop.md_ro_statuses.default_completed,
       notes: {
         data: [
diff --git a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
index 78eaa28eb..e9486afa9 100644
--- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
+++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
@@ -118,7 +118,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             },
           ]}
         >
-          <InputNumber />
+          <InputNumber precision={0} />
         </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.fleetnumber")}
diff --git a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
index 16124cd0f..46f742304 100644
--- a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
+++ b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
@@ -31,7 +31,7 @@ export default function CourtesyCarReturnModalComponent() {
           },
         ]}
       >
-        <InputNumber />
+        <InputNumber precision={0} />
       </Form.Item>
       <Form.Item
         label={t("contracts.fields.fuelin")}