diff --git a/packages/core/src/node-execution-context/local-load-options-context.ts b/packages/core/src/node-execution-context/local-load-options-context.ts
index 37e5b09bf3..6f6e76215c 100644
--- a/packages/core/src/node-execution-context/local-load-options-context.ts
+++ b/packages/core/src/node-execution-context/local-load-options-context.ts
@@ -1,5 +1,5 @@
 import { get } from 'lodash';
-import { ApplicationError, deepCopy, Workflow } from 'n8n-workflow';
+import { ApplicationError, Workflow } from 'n8n-workflow';
 import type {
 	INodeParameterResourceLocator,
 	IWorkflowExecuteAdditionalData,
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index 41ea199cd2..fdd06073e9 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -244,9 +244,8 @@ async function loadFieldsToMap(): Promise<void> {
 		return;
 	}
 
-	const resourceMapperMethod = props.parameter.typeOptions?.resourceMapper?.resourceMapperMethod;
-	const localResourceMapperMethod =
-		props.parameter.typeOptions?.resourceMapper?.localResourceMapperMethod;
+	const { resourceMapperMethod = undefined, localResourceMapperMethod = undefined } =
+		props.parameter.typeOptions?.resourceMapper ?? {};
 
 	let fetchedFields = null;
 
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts b/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
index b1ed586bb7..ad140e6c77 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
@@ -16,7 +16,7 @@ import {
 	VALUES,
 	TYPE_OPTIONS,
 	INPUT_OPTIONS,
-	DEFAULT_PLACEHOLDER,
+	FALLBACK_DEFAULT_VALUE,
 } from './constants';
 
 const SUPPORTED_TYPES = TYPE_OPTIONS.map((x) => x.value);
@@ -123,7 +123,7 @@ export function getWorkflowInputData(
 		try {
 			for (const { name, type } of newParams) {
 				if (!item.json.hasOwnProperty(name)) {
-					newItem.json[name] = DEFAULT_PLACEHOLDER;
+					newItem.json[name] = FALLBACK_DEFAULT_VALUE;
 					continue;
 				}
 
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/constants.ts b/packages/nodes-base/nodes/ExecuteWorkflow/constants.ts
index 17afaf45ed..7f54f28809 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/constants.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/constants.ts
@@ -33,4 +33,4 @@ export const TYPE_OPTIONS: Array<{ name: string; value: FieldType | 'any' }> = [
 	// Intentional omission of `dateTime`, `time`, `string-alphanumeric`, `form-fields`, `jwt` and `url`
 ];
 
-export const DEFAULT_PLACEHOLDER = null;
+export const FALLBACK_DEFAULT_VALUE = null;