diff --git a/src/app/(protected)/workorders/_components/comp-doc/use-comp-doc-dialog.tsx b/src/app/(protected)/workorders/_components/comp-doc/use-comp-doc-dialog.tsx
index 6238d1df..5c0cb39a 100644
--- a/src/app/(protected)/workorders/_components/comp-doc/use-comp-doc-dialog.tsx
+++ b/src/app/(protected)/workorders/_components/comp-doc/use-comp-doc-dialog.tsx
@@ -34,7 +34,7 @@ type UseCompDocDialogArgs = {
 function completionDocTechnician(
   assigned: boolean | null | undefined,
   frozenAssigned: boolean | null | undefined,
-  contactName: string,
+  contactName: string | undefined,
 ): string {
   return assigned === false || frozenAssigned === false ? "" : contactName || "";
 }
diff --git a/src/app/(protected)/workorders/_components/list/table/cells/use-vendor-dialog-form.ts b/src/app/(protected)/workorders/_components/list/table/cells/use-vendor-dialog-form.ts
index 3cdd7841..4411f5ba 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/use-vendor-dialog-form.ts
+++ b/src/app/(protected)/workorders/_components/list/table/cells/use-vendor-dialog-form.ts
@@ -173,7 +173,6 @@ export function useVendorDialogForm({
       pendingCreateCount: Object.keys(pendingCreates).length,
     },
     baseline: {
-      company,
       ...buildSubmitBaseline({ ...technicianKeyArgs, techPhone }),
     },
   });
diff --git a/src/app/(protected)/workorders/_components/list/table/cells/use-vendor-dialog-save.ts b/src/app/(protected)/workorders/_components/list/table/cells/use-vendor-dialog-save.ts
index f02ea2c3..3523c645 100644
--- a/src/app/(protected)/workorders/_components/list/table/cells/use-vendor-dialog-save.ts
+++ b/src/app/(protected)/workorders/_components/list/table/cells/use-vendor-dialog-save.ts
@@ -48,7 +48,7 @@ async function resolvePersistedVendor(args: {
   phone: string;
   addTechnicians: ReturnType<typeof useAddTechniciansToCompany>;
   setSaveError: (error: string | null) => void;
-}): Promise<VendorDropdownItem | null> {
+}): Promise<VendorDropdownItem | undefined | null> {
   const payload = args.vendor ? args.pendingCreates[String(args.vendor.id)] : undefined;
   if (!args.vendor || !isDraftVendorId(args.vendor.id) || !payload) return args.vendor;
   try {
@@ -71,7 +71,7 @@ function resolveVendorForSave(args: {
   phone: string;
   addTechnicians: ReturnType<typeof useAddTechniciansToCompany>;
   setSaveError: (error: string | null) => void;
-}): VendorDropdownItem | undefined | Promise<VendorDropdownItem | null> {
+}): VendorDropdownItem | undefined | Promise<VendorDropdownItem | undefined | null> {
   const payload = args.vendor ? args.pendingCreates[String(args.vendor.id)] : undefined;
   if (!args.vendor || !isDraftVendorId(args.vendor.id) || !payload) return args.vendor;
   return resolvePersistedVendor(args);