diff --git a/Makefile b/Makefile
index 9443177..f304d43 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ BENCHMARKS ?= boom_med_pb		\
               ispd16_example2
 
 
-BENCHMARKS_URL = https://github.com/Xilinx/fpga24_routing_contest/releases/latest/download/benchmarks.tar.gz
+BENCHMARKS_URL = https://github.com/eddieh-xlnx/fpga24_routing_contest/releases/download/benchmarks/benchmarks.tar.gz
 
 # Inherit proxy settings from the host if they exist
 HTTPHOST=$(firstword $(subst :, ,$(subst http:,,$(subst /,,$(HTTP_PROXY)))))
diff --git a/RapidWright b/RapidWright
index 683e572..16f7696 160000
--- a/RapidWright
+++ b/RapidWright
@@ -1 +1 @@
-Subproject commit 683e5723b4e9c7e1d98aa3cb1e05e3216f8ca081
+Subproject commit 16f76969124bbabba918f83eb666e80c09c8f057