diff --git a/nodes/agent/BaseAgent.py b/nodes/agent/BaseAgent.py
index 4535a5b..8ed55e2 100644
--- a/nodes/agent/BaseAgent.py
+++ b/nodes/agent/BaseAgent.py
@@ -116,10 +116,11 @@ class BaseAgent:
         if config:
             create_dict["config"] = config
         elif agent:
+            config = agent.config
             create_dict["config"] = agent.config
 
         # Tools
-        create_dict["tools"] = self.tool_check(create_dict["config"], tools)
+        create_dict["tools"] = self.tool_check(config, tools)
 
         # Rulesets
         if len(rulesets) > 0:
diff --git a/nodes/combine/RulesList.py b/nodes/combine/RulesList.py
index c5fd6d1..db02ba9 100644
--- a/nodes/combine/RulesList.py
+++ b/nodes/combine/RulesList.py
@@ -19,7 +19,7 @@ class RulesList:
     RETURN_TYPES = ("RULESET",)
     RETURN_NAMES = ("RULESET",)
     FUNCTION = "create"
-    OUTPUT_IS_LIST = (True,)
+    # OUTPUT_IS_LIST = (True,)
     CATEGORY = "Griptape/Agent Rules"
 
     def create(self, **kwargs):
diff --git a/nodes/combine/ToolList.py b/nodes/combine/ToolList.py
index 63a1f2b..37eb2e4 100644
--- a/nodes/combine/ToolList.py
+++ b/nodes/combine/ToolList.py
@@ -19,7 +19,7 @@ class ToolList:
     RETURN_TYPES = ("TOOL_LIST",)
     RETURN_NAMES = ("TOOL_LIST",)
     FUNCTION = "create"
-    OUTPUT_IS_LIST = (True,)
+    # OUTPUT_IS_LIST = (True,)
 
     CATEGORY = "Griptape/Agent Tools"