diff --git a/vlsi/Makefile b/vlsi/Makefile
index 7fbfcc2c..42af7ba2 100644
--- a/vlsi/Makefile
+++ b/vlsi/Makefile
@@ -129,7 +129,9 @@ $(SIM_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_file
 	  echo '    - "'$$x'"' >> $@; \
 	done
 	echo "  execution_flags_meta: 'append'" >> $@
+ifneq ($(BINARY), )
 	echo "  benchmarks: ['$(BINARY)']" >> $@
+endif
 	echo "  tb_dut: 'testHarness.$(VLSI_HARNESS_DUT_NAME)'" >> $@
 
 $(SIM_DEBUG_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_files)
@@ -158,12 +160,14 @@ $(POWER_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_fi
 	echo "power.inputs:" > $@
 	echo "  tb_dut: 'testHarness/$(VLSI_HARNESS_DUT_NAME)'" >> $@
 	echo "  database: '$(OBJ_DIR)/par-rundir/$(VLSI_TOP)_FINAL'" >> $@
+ifneq ($(BINARY), )
 	echo "  saifs: [" >> $@
 	echo "    '$(OBJ_DIR)/sim-par-rundir/$(notdir $(BINARY))/ucli.saif'" >> $@
 	echo "  ]" >> $@
 	echo "  waveforms: [" >> $@
 	#echo "    '$(OBJ_DIR)/sim-par-rundir/$(notdir $(BINARY))/$(sim_out_name).vcd'" >> $@
 	echo "  ]" >> $@
+endif
 	echo "  start_times: ['0ns']" >> $@
 	echo "  end_times: [" >> $@
 	echo "    '`bc <<< $(timeout_cycles)*$(CLOCK_PERIOD)`ns'" >> $@
diff --git a/vlsi/hammer b/vlsi/hammer
index 9d83bbad..a05f97b1 160000
--- a/vlsi/hammer
+++ b/vlsi/hammer
@@ -1 +1 @@
-Subproject commit 9d83bbadc0caaa7f81b4929c4e32333fc5a8d900
+Subproject commit a05f97b1f75ba924df117dfc34a11b1ada9406c1
diff --git a/vlsi/hammer-cadence-plugins b/vlsi/hammer-cadence-plugins
index f644138b..7ad99d44 160000
--- a/vlsi/hammer-cadence-plugins
+++ b/vlsi/hammer-cadence-plugins
@@ -1 +1 @@
-Subproject commit f644138bab11075f267a3f1d72108da13c8a05ab
+Subproject commit 7ad99d445f3121662aee6531950f6a9ac2da2256
diff --git a/vlsi/hammer-synopsys-plugins b/vlsi/hammer-synopsys-plugins
index ef163445..78dac526 160000
--- a/vlsi/hammer-synopsys-plugins
+++ b/vlsi/hammer-synopsys-plugins
@@ -1 +1 @@
-Subproject commit ef163445eec6362fa6a9bf6be0bd18a5d36c707e
+Subproject commit 78dac526c0864ee826b989619e27036175b5edee