diff --git a/cheshire.mk b/cheshire.mk
index 09b6bfc8..9da8963f 100644
--- a/cheshire.mk
+++ b/cheshire.mk
@@ -53,7 +53,7 @@ chs-clean-deps:
 ######################
 
 CHS_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:pulp-restricted/cheshire-nonfree.git
-CHS_NONFREE_COMMIT ?= 6fcdd83e2dca1668d02870f9751e15ea2e068f63
+CHS_NONFREE_COMMIT ?= f2cb961f00ee2b2832344ce9b39fa1838bf62792
 
 chs-nonfree-init:
 	git clone $(CHS_NONFREE_REMOTE) $(CHS_ROOT)/nonfree
diff --git a/target/xilinx/flavor_vanilla/flavor_vanilla.mk b/target/xilinx/flavor_vanilla/flavor_vanilla.mk
index a0d94125..3679c8e0 100644
--- a/target/xilinx/flavor_vanilla/flavor_vanilla.mk
+++ b/target/xilinx/flavor_vanilla/flavor_vanilla.mk
@@ -42,8 +42,8 @@ $(CHS_XIL_DIR)/flavor_vanilla/scripts/add_sources_%.tcl: Bender.yml
 
 # Compile bitstream
 $(CHS_XIL_DIR)/flavor_vanilla/builds/cheshire_vanilla_genesys2/cheshire_vanilla_genesys2.runs/impl_1/cheshire_top_xilinx.bit: $(CHS_XIL_DIR)/flavor_vanilla/scripts/add_sources_genesys2.tcl $(chs_xilinx_ips_paths_vanilla)
-	@mkdir -p $(CHS_XIL_DIR)/flavor_vanilla/builds/cheshire_vanilla_$*
-	cd $(CHS_XIL_DIR)/flavor_vanilla/builds/cheshire_vanilla_$* && $(chs_vivado_env_vanilla) $(VIVADO) $(VIVADO_FLAGS) -source $(CHS_XIL_DIR)/flavor_vanilla/scripts/run.tcl
+	@mkdir -p $(CHS_XIL_DIR)/flavor_vanilla/builds/cheshire_vanilla_genesys2
+	cd $(CHS_XIL_DIR)/flavor_vanilla/builds/cheshire_vanilla_genesys2 && $(chs_vivado_env_vanilla) $(VIVADO) $(VIVADO_FLAGS) -source $(CHS_XIL_DIR)/flavor_vanilla/scripts/run.tcl
 
 .PHONY: chs-xil-clean-vanilla
 chs-xil-clean-vanilla:
diff --git a/target/xilinx/xilinx.mk b/target/xilinx/xilinx.mk
index 1b551056..a1f86ab1 100644
--- a/target/xilinx/xilinx.mk
+++ b/target/xilinx/xilinx.mk
@@ -93,11 +93,12 @@ chs-xil-vanilla-genesys2: $(CHS_XIL_DIR)/out/cheshire_vanilla_genesys2.bit
 # Program bitstream (XILINX_BOARD)
 chs-xil-program:
 	@echo "Programming board $(chs_xilinx_board) ($(xilinx_part))"
-	$(chs_vivado_env) $(VIVADO) $(VIVADO_FLAGS) xilinx_bit=$(chs_xilinx_bit) -source $(CHS_XIL_DIR)/scripts/program.tcl
+	$(chs_vivado_env) xilinx_bit=$(CHS_XIL_DIR)/out/cheshire_$(chs_xilinx_flavor)_$(chs_xilinx_board).bit $(VIVADO) $(VIVADO_FLAGS) -source $(CHS_XIL_DIR)/scripts/program.tcl
 
 chs-xil-program-vanilla-genesys2: $(CHS_XIL_DIR)/out/cheshire_vanilla_genesys2.bit
 	${MAKE} chs_xilinx_flavor=vanilla chs_xilinx_board=genesys2 chs-xil-program
 
 chs-xil-clean: chs-xil-clean-vanilla xilinx-ip-clean-all
+	rm -rf $(CHS_XIL_DIR)/out
 
 .PHONY: chs-xil-vanilla-genesys2 chs-xil-program-vanilla-genesys2 chs-xil-program chs-xil-clean
diff --git a/target/xilinx/xilinx_ips/xlnx_mig_7_ddr3/tcl/run.tcl b/target/xilinx/xilinx_ips/xlnx_mig_7_ddr3/tcl/run.tcl
index 610103fa..b683c4eb 100644
--- a/target/xilinx/xilinx_ips/xlnx_mig_7_ddr3/tcl/run.tcl
+++ b/target/xilinx/xilinx_ips/xlnx_mig_7_ddr3/tcl/run.tcl
@@ -6,7 +6,7 @@
 
 set partNumber $::env(xilinx_part)
 set boardName  $::env(xilinx_board_long)
-set boardNameShort $::env(xilinx_board)
+set boardNameShort $::env(chs_xilinx_board)
 
 set ipName xlnx_mig_7_ddr3