diff --git a/client/src/components/loading-spinner/loading-spinner.component.jsx b/client/src/components/loading-spinner/loading-spinner.component.jsx
index 7e172b1f0..1bbf80dfb 100644
--- a/client/src/components/loading-spinner/loading-spinner.component.jsx
+++ b/client/src/components/loading-spinner/loading-spinner.component.jsx
@@ -13,7 +13,7 @@ export default function LoadingSpinner({ loading = true, message, ...props }) {
           alignContent: "center"
         }}
         // TODO: Client Update - if anything funky happens check this out
-        {...props.children ? { tip: message ? message : null } : {}}
+        {...(props.children ? { tip: message ? message : null } : {})}
         delay={200}
         // TODO: Client Update - tip only works when there are actually children, and this component is used in a lot of places where there are no children
       >
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index 23ea91095..881609624 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -68,7 +68,7 @@ export function ScheduleJobModalComponent({
 
       if (values.start && !values.scheduled_completion)
         form.setFieldsValue({
-          scheduled_completion: dayjs(values.start).businessAdd(
+          scheduled_completion: dayjs(values.start).businessDaysAdd(
             totalHours / bodyshop.target_touchtime,
             "day"
           ),