diff --git a/chisel b/chisel
index ededc302..d3e0c015 160000
--- a/chisel
+++ b/chisel
@@ -1 +1 @@
-Subproject commit ededc302ed1fc9ba9d583cf32d50deec55683952
+Subproject commit d3e0c01512b61cf4755b1d6b99b7e8865514689a
diff --git a/emulator/Makefile b/emulator/Makefile
index 52d98314..98e77e1b 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -7,6 +7,7 @@ sim_dir = .
 output_dir = $(sim_dir)/output
 
 BACKEND = c
+#CONFIG ?= ZscaleConfig
 CONFIG ?= DefaultCPPConfig
 
 include $(base_dir)/Makefrag
diff --git a/fpga-zynq b/fpga-zynq
index eb82eb8b..2bf892b5 160000
--- a/fpga-zynq
+++ b/fpga-zynq
@@ -1 +1 @@
-Subproject commit eb82eb8b80495a48fd2e23a969fd6725b1e12e29
+Subproject commit 2bf892b5ba22661d925bc8c1fb2cbaf091b1d6ad