diff --git a/generators/testchipip b/generators/testchipip
index 52027a04..03535f56 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit 52027a049f7810013e5940a1c115ff83127c1a96
+Subproject commit 03535f56a6318236ab6abf5342d78eecf453984d
diff --git a/vlsi/Makefile b/vlsi/Makefile
index 3aaebf3b..924fa964 100644
--- a/vlsi/Makefile
+++ b/vlsi/Makefile
@@ -180,9 +180,7 @@ $(SIM_DEBUG_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_commo
 	echo "  saif.end_time: '`bc <<< $(timeout_cycles)*$(CLOCK_PERIOD)`ns'" >> $@
 ifdef USE_FSDB
 	echo "  options:" >> $@
-	echo '    - "-debug_access+all"' >> $@
 	echo '    - "-kdb"' >> $@
-	echo '    - "-lca"' >> $@
 	echo "  options_meta: 'append'" >> $@
 	echo "sim.outputs.waveforms: ['$(sim_out_name).fsdb']" >> $@
 else
diff --git a/vlsi/hammer b/vlsi/hammer
index 52c9b019..d200c62e 160000
--- a/vlsi/hammer
+++ b/vlsi/hammer
@@ -1 +1 @@
-Subproject commit 52c9b0191fbc32dc40c62f3b75374b1f46f39f0f
+Subproject commit d200c62ec2d35b7d999f10487e89527f95180d79
diff --git a/vlsi/hammer-synopsys-plugins b/vlsi/hammer-synopsys-plugins
index 81720fdd..696589f3 160000
--- a/vlsi/hammer-synopsys-plugins
+++ b/vlsi/hammer-synopsys-plugins
@@ -1 +1 @@
-Subproject commit 81720fdd5b7fd747f34606f09b8a7d0da438a3ef
+Subproject commit 696589f3fec890722539653a9b259dcc860c1f7d