diff --git a/riscv-target/serv/compliance_io.h b/riscv-target/serv/compliance_io.h
index 65e0148..5bfa263 100644
--- a/riscv-target/serv/compliance_io.h
+++ b/riscv-target/serv/compliance_io.h
@@ -27,9 +27,9 @@
 //-----------------------------------------------------------------------
 
 #define RVTEST_IO_INIT
-#define RVTEST_IO_WRITE_STR(_STR)
+#define RVTEST_IO_WRITE_STR(_SP, _STR)
 #define RVTEST_IO_CHECK()
-#define RVTEST_IO_ASSERT_GPR_EQ(_R, _I)
+#define RVTEST_IO_ASSERT_GPR_EQ(_SP, _R, _I)
 #define RVTEST_IO_ASSERT_SFPR_EQ(_F, _R, _I)
 #define RVTEST_IO_ASSERT_DFPR_EQ(_D, _R, _I)
 
diff --git a/riscv-target/serv/device/rv32i/Makefile.include b/riscv-target/serv/device/rv32i/Makefile.include
index 9ef57a7..046cff8 100644
--- a/riscv-target/serv/device/rv32i/Makefile.include
+++ b/riscv-target/serv/device/rv32i/Makefile.include
@@ -6,8 +6,8 @@ endif
 RUN_TARGET=\
     $(TARGET_SIM) \
         +timeout=100000000 \
-        +signature=$(work_dir_isa)/$(*).signature.output \
-        +firmware=$(work_dir_isa)/$<.hex 2> $(work_dir_isa)/$@
+        +signature=$(*).signature.output \
+        +firmware=$(<).hex 2> $@
 
 RISCV_PREFIX   ?= riscv32-unknown-elf-
 RISCV_GCC      ?= $(RISCV_PREFIX)gcc
@@ -16,11 +16,11 @@ RISCV_OBJDUMP  ?= $(RISCV_PREFIX)objdump
 RISCV_GCC_OPTS ?= -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles
 
 COMPILE_TARGET=\
-	$$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \
+	$$(RISCV_GCC) $(1) $$(RISCV_GCC_OPTS) \
 		-I$(ROOTDIR)/riscv-test-env/ \
 		-I$(TARGETDIR)/$(RISCV_TARGET)/ \
 		-T$(TARGETDIR)/$(RISCV_TARGET)/link.ld $$< \
-		-o $(work_dir_isa)/$$@; \
-	$$(RISCV_OBJCOPY) -O binary $(work_dir_isa)/$$@  $(work_dir_isa)/$$@.bin; \
-	$$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump; \
-	python3 $(TARGETDIR)/$(RISCV_TARGET)/makehex.py $(work_dir_isa)/$$@.bin 2048 > $(work_dir_isa)/$$@.hex;
+		-o $$@; \
+	$$(RISCV_OBJCOPY) -O binary $$@  $$@.bin; \
+	$$(RISCV_OBJDUMP) -D $$@ > $$@.objdump; \
+	python3 $(TARGETDIR)/$(RISCV_TARGET)/makehex.py $$@.bin 2048 > $$@.hex;