diff --git a/Makefile b/Makefile
index 0544fb8d1..1c67aad38 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@ install:
 	cp ${RISCV}/riscv-isa-sim/arch_test_target/spike/Makefile.include addins/riscv-arch-test/
 	sed -i '/export TARGETDIR ?=/c\export TARGETDIR ?= ${RISCV}/riscv-isa-sim/arch_test_target' addins/riscv-arch-test/Makefile.include
 	echo export RISCV_PREFIX = riscv64-unknown-elf- >> addins/riscv-arch-test/Makefile.include
-	cd tests/linux-testgen/linux-testvectors; source ./tvLinker.sh # needs to be run in local directory
-	rm tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
-	ln -s ${RISCV}/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
+	#cd tests/linux-testgen/linux-testvectors; source ./tvLinker.sh # needs to be run in local directory
+	#rm tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
+	#ln -s ${RISCV}/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
 
 regression:
 	make -C pipelined/regression
diff --git a/pipelined/regression/Makefile b/pipelined/regression/Makefile
index 0176b7eca..302ee4a92 100644
--- a/pipelined/regression/Makefile
+++ b/pipelined/regression/Makefile
@@ -5,7 +5,7 @@ make allclean:
 make clean:
 	make clean -C ../../addins/riscv-arch-test
 	make clean -C ../../tests/wally-riscv-arch-test
-	make allclean -C ../../tests/imperas-riscv-tests
+#	make allclean -C ../../tests/imperas-riscv-tests
 
 make all:
 	# *** Build old tests/imperas-riscv-tests for now;
diff --git a/pipelined/regression/makefile-memfile b/pipelined/regression/makefile-memfile
index 030cf8d57..33af19538 100644
--- a/pipelined/regression/makefile-memfile
+++ b/pipelined/regression/makefile-memfile
@@ -2,8 +2,10 @@ ROOT	:= ../..
 SUFFIX	:= work
 ARCHDIR	:= $(ROOT)/addins/riscv-arch-test
 WALLYDIR:= $(ROOT)/tests/wally-riscv-arch-test
+# IMPERASDIR	:= $(ROOT)/tests/imperas-riscv-tests
+# ALLDIRS := $(ARCHDIR)/$(SUFFIX) $(WALLYDIR)/$(SUFFIX) $(IMPERASDIR)/$(SUFFIX)
 IMPERASDIR	:= $(ROOT)/tests/imperas-riscv-tests
-ALLDIRS := $(ARCHDIR)/$(SUFFIX) $(WALLYDIR)/$(SUFFIX) $(IMPERASDIR)/$(SUFFIX)
+ALLDIRS := $(ARCHDIR)/$(SUFFIX) $(WALLYDIR)/$(SUFFIX) 
 
 ELFFILES	?= $(shell find $(ALLDIRS) -type f -regex ".*\.elf")
 MEMFILES ?= $(ELFFILES:.elf=.elf.memfile)
diff --git a/pipelined/src/fma/fma.do b/pipelined/src/fma/fma.do
index 001ae9730..9a7de1267 100644
--- a/pipelined/src/fma/fma.do
+++ b/pipelined/src/fma/fma.do
@@ -8,7 +8,7 @@ onbreak {resume}
 # create library
 vlib worklib
 
-vlog -lint -work worklib fma16.sv testbench.sv
+vlog -lint -work worklib fma16.sv testbench.v
 vopt +acc worklib.testbench_fma16 -work worklib -o testbenchopt
 vsim -lib worklib testbenchopt
 
diff --git a/pipelined/src/fma/testbench.sv b/pipelined/src/fma/testbench.v
similarity index 100%
rename from pipelined/src/fma/testbench.sv
rename to pipelined/src/fma/testbench.v
diff --git a/setup.sh b/setup.sh
index 3ec6c8408..b1425d7e1 100755
--- a/setup.sh
+++ b/setup.sh
@@ -24,7 +24,7 @@ export PATH=/usr/local/bin/verilator:$PATH # Change this for your path to Verila
 export PATH=/cad/mentor/questa_sim-2021.2_1/questasim/bin:$PATH    # Change this for your path to Modelsim
 export MGLS_LICENSE_FILE=1717@solidworks.eng.hmc.edu # Change this to your Siemens license server
 export PATH=/cad/synopsys/SYN/bin:$PATH  # Change this for your path to Design Compiler
-# *** license
+export SNPSLMD_LICENSE_FILE=27020@134.173.38.214
 
 # Imperas; *** remove if not using; *** fix paths
 export PATH=$RISCV/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64:$PATH  # *** maybe take this out based on Imperas