diff --git a/Makefile b/Makefile
index 184dbe8d1..0b52807bc 100755
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,6 @@ $(tests): build
 	${library}.$@_tb_optimized
 
 # User Verilator, at some point in the future this will be auto-generated
-# --trace-structs --trace
 verilate:
 	$(verilator)                                                     \
     $(ariane_pkg)                                                    \
@@ -165,6 +164,7 @@ verilate:
     -Wno-UNOPTFLAT                                                   \
     -Wno-UNUSED                                                      \
     -Wno-ASSIGNDLY                                                   \
+    --trace-structs --trace \
     -LDFLAGS "-lfesvr" -CFLAGS "-std=c++11 -I../tb/dpi" -Wall --cc  --vpi  \
     $(list_incdir) --top-module ariane_testharness \
     --Mdir build \
diff --git a/ci/install-fesvr.sh b/ci/install-fesvr.sh
index 659183feb..978207996 100755
--- a/ci/install-fesvr.sh
+++ b/ci/install-fesvr.sh
@@ -5,7 +5,7 @@ cd $ROOT/tmp
 RELEASE=0.1.0
 
 if ! [ -e $ROOT/tmp/riscv-fesvr ]; then
-    https://github.com/riscv/riscv-fesvr.git
+    git clone https://github.com/riscv/riscv-fesvr.git
 fi
 cd $ROOT/tmp/riscv-fesvr
 mkdir -p build
diff --git a/tb b/tb
index dfbfc8c26..70397e11e 160000
--- a/tb
+++ b/tb
@@ -1 +1 @@
-Subproject commit dfbfc8c261472cf0ecf1ba04e5dce00251294c19
+Subproject commit 70397e11ee3b0243f53a34facd64e9ac5b8a576c