diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4094bef..8c0f69f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,20 +48,20 @@ add_dependency(
 
 add_dependency(
   GIT ecap5/verilator-cmake
-  TAG release/v1.1.0)
+  TAG tags/v1.1.0)
 
 add_dependency(
   GIT ecap5/ecap5-treq
-  TAG release/v3.0.0
+  TAG tags/v3.0.0
   BINARY ecap5-treq)
 
 add_dependency(
   GIT ecap5/oss-cad-suite-cmake
-  TAG release/v2.0.0)
+  TAG tags/v2.0.0)
 
 add_dependency(
   GIT ecap5/ecap5-dtestlib
-  TAG release/v1.1.0)
+  TAG tags/v1.1.0)
 
 add_dependency(
   GIT ecap5/riscv-tests
@@ -105,5 +105,6 @@ if(PROJECT_IS_TOP_LEVEL)
     TOP_MODULE ecap5_dproc
     TARGET_FPGA ecp5
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/synth.json)
+ 
   add_custom_target(synth DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/synth.json)
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 85f132a..446975d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,6 +19,9 @@
 # You should have received a copy of the GNU General Public License
 # along with ECAP5-DPROC.  If not, see <http://www.gnu.org/licenses/>.
 
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 # Bench parent directory
 set(BENCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/benches/)
 # C++ bench include directory