diff --git a/vivado/defs.bzl b/vivado/defs.bzl
index c3eb9493..be481703 100644
--- a/vivado/defs.bzl
+++ b/vivado/defs.bzl
@@ -438,7 +438,7 @@ vivado_placement = rule(
     ],
 )
 
-def _vivado_place_optimi    outputs = [bitstream]ze_impl(ctx):
+def _vivado_place_optimize_impl(ctx):
     placement_checkpoint = ctx.actions.declare_file("{}.dcp".format(ctx.label.name))
     timing_summary_report = ctx.actions.declare_file("{}_timing.rpt".format(ctx.label.name))
     util_report = ctx.actions.declare_file("{}_util.rpt".format(ctx.label.name))
@@ -593,7 +593,7 @@ def _vivado_write_bitstream_impl(ctx):
 
     outputs = [bitstream]
 
-    if ctx.with_xsa:
+    if ctx.attr.with_xsa:
         with_xsa_str = "1"
         xsa_out = ctx.actions.declare_file("{}.xsa".format(ctx.label.name))
         xsa_path = xsa_out.path
@@ -653,7 +653,7 @@ vivado_write_bitstream = rule(
     ],
 )
 
-def vivado_flow(name, module, module_top, part_number, xilinx_env, tags = [], ip_blocks = []):
+def vivado_flow(name, module, module_top, part_number, xilinx_env, tags = [], ip_blocks = [], with_xsa=False):
     """Runs the entire bitstream flow as a convenience macro.
 
     Args:
@@ -664,6 +664,7 @@ def vivado_flow(name, module, module_top, part_number, xilinx_env, tags = [], ip
         xilinx_env: The shell script to setup the Xilinx/vivado environment.
         tags: Optional tags to use for the rules.
         ip_blocks: Optional ip blocks to include in a design.
+        with_xsa: Also generate the xsa file.
     """
     vivado_synthesize(
         name = "{}_synth".format(name),
@@ -708,6 +709,7 @@ def vivado_flow(name, module, module_top, part_number, xilinx_env, tags = [], ip
         checkpoint = "{}_route".format(name),
         xilinx_env = xilinx_env,
         tags = tags,
+        with_xsa = with_xsa,
     )
 
 def _xsim_test_impl(ctx):