diff --git a/setup.sh b/setup.sh
index 9f0fca993..05e666b5c 100644
--- a/setup.sh
+++ b/setup.sh
@@ -33,6 +33,13 @@ echo \$WALLY set to "${WALLY}"
 # utility functions in Wally repository
 export PATH=$WALLY/bin:$PATH
 
+# Setup cvw-arch-verif paths
+if [ -e "${WALLY}"/addins/cvw-arch-verif/setup.sh ]; then
+    source "${WALLY}"/addins/cvw-arch-verif/setup.sh
+else
+    echo "setup.sh not found in \$WALLY/addins/cvw-arch-verif directory. Make sure you cloned the submodules."
+fi
+
 # Verilator needs a larger core file size to simulate CORE-V Wally
 ulimit -c 300000
 
@@ -41,6 +48,7 @@ if [ -e "${RISCV}"/site-setup.sh ]; then
     source "${RISCV}"/site-setup.sh
 else
     echo "site-setup.sh not found in \$RISCV directory. Rerun wally-toolchain-install.sh to automatically download it."
+    exit 1
 fi
 
 echo "setup done"
diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index ba9891c0d..70c258c04 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -111,13 +111,8 @@ if {[lcheck lst "--ccov"]} {
 
 # if --fcov found set flag and remove from list
 if {[lcheck lst "--fcov"]} {
-    set IMPERAS_HOME $::env(IMPERAS_HOME)
     set FunctCoverage 1
-    set FCvlog "+incdir+${FCRVVI}/unpriv \
-                +incdir+${FCRVVI}/priv +incdir+${FCRVVI}/rv64_priv +incdir+${FCRVVI}/rv32_priv \
-                +incdir+${FCRVVI}/common +incdir+${FCRVVI} \
-                +incdir+$env(WALLY)/addins/cvw-arch-verif/riscvISACOV/source \
-                ${FCRVVI}/*.sv"
+    set FCvlog "-f ${FCRVVI}/cvw-arch-verif.f"
 }
 
 # if --lockstep found set flag and remove from list