diff --git a/package-lock.json b/package-lock.json
index 3c4d8ae..8353bd1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@ping-identity/dvlint-base-rule-pack",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@ping-identity/dvlint-base-rule-pack",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "license": "Apache License 2.0",
       "dependencies": {
         "@ping-identity/dvlint": "^1.0.4"
diff --git a/rules/dv-rule-node-001/NodeRule.js b/rules/dv-rule-node-001/NodeRule.js
index 8d6b907..d4f44dd 100644
--- a/rules/dv-rule-node-001/NodeRule.js
+++ b/rules/dv-rule-node-001/NodeRule.js
@@ -50,10 +50,7 @@ class NodeRule extends LintRule {
           if (
             data.nodeType === "CONNECTION" &&
             !data.properties?.nodeTitle?.value &&
-            !(
-              (data.name === "Teleport" || data.name === "Node") &&
-              data.capabilityName === "goToNode"
-            )
+            !(data.capabilityName === 'goToNode' || data.capabilityName === 'returnBackToCallingNode')
           ) {
             this.addError("dv-bp-node-001", {
               flowId: flow.flowId,
@@ -67,10 +64,7 @@ class NodeRule extends LintRule {
           if (
             data.nodeType === "CONNECTION" &&
             !data.properties?.nodeDescription?.value &&
-            !(
-              (data.name === "Teleport" || data.name === "Node") &&
-              data.capabilityName === "goToNode"
-            )
+            !(data.capabilityName === 'goToNode' || data.capabilityName === 'returnBackToCallingNode')
           ) {
             this.addError("dv-bp-node-003", {
               flowId: flow.flowId,
@@ -95,7 +89,7 @@ class NodeRule extends LintRule {
               this.addError("dv-bp-node-002", {
                 flowId: flow.flowId,
                 messageArgs: [
-                  data.properties?.backgroundColor?.value.toLowerCase(),
+                  data.properties?.backgroundColor?.value.toLowerCase() || '',
                   `${data.name} (${data.id}) - ${data.capabilityName}`,
                 ],
                 recommendationArgs: [`${data.name} (${data.id}) - ${data.capabilityName}`, backgroundColor[connectorCapability]],
diff --git a/rules/dv-rule-subflow-001/SubflowRule.js b/rules/dv-rule-subflow-001/SubflowRule.js
index 87eb1df..af93789 100644
--- a/rules/dv-rule-subflow-001/SubflowRule.js
+++ b/rules/dv-rule-subflow-001/SubflowRule.js
@@ -97,6 +97,7 @@ class DVRule extends LintRule {
               if (missingFields?.length > 0) {
                 const selectedSubflowName = node.data.properties.subFlowId.value.label;
                 this.addError("dv-er-subflow-003", {
+                  flowId: targetFlow.flowId,
                   messageArgs: [selectedSubflowName],
                   recommendationArgs: [selectedSubflowName],
                   nodeId: node.data.id,