diff --git a/masque/builder/tools.py b/masque/builder/tools.py
index d0dcaa7..b99e773 100644
--- a/masque/builder/tools.py
+++ b/masque/builder/tools.py
@@ -606,7 +606,7 @@ class AutoTool(Tool, metaclass=ABCMeta):
         else:
             out_ptype_actual = self.default_out_ptype
 
-        data = self.LData(straight_length, straight, straight_kwargs, ccw, bend, in_transition, b_transition, out_transition)
+        data = self.LData(straight_length, straight, kwargs, ccw, bend, in_transition, b_transition, out_transition)
         out_port = Port((length, bend_run), rotation=bend_angle, ptype=out_ptype_actual)
         return out_port, data
 
@@ -621,7 +621,7 @@ class AutoTool(Tool, metaclass=ABCMeta):
         """
         Render an L step into a preexisting tree
         """
-        pat = tree.top()
+        pat = tree.top_pattern()
         if data.in_transition:
             pat.plug(data.in_transition.abstract, {port_names[1]: data.in_transition.their_port_name})
         if not numpy.isclose(data.straight_length, 0):