diff --git a/linux/Makefile b/linux/Makefile
index 3d880bc08..373142615 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -27,14 +27,6 @@ BINARIES := fw_jump.elf vmlinux busybox
 OBJDUMPS := $(foreach name, $(BINARIES), $(basename $(name) .elf))
 OBJDUMPS := $(foreach name, $(OBJDUMPS), $(DIS)/$(name).objdump)
 
-define linuxDir =
-$(shell find $(BUILDROOT)/output/build -maxdepth 2 -type d -regex ".*/linux-[0-9]+\.[0-9]+\.[0-9]+$$")
-endef
-
-define busyboxDir =
-$(shell find $(BUILDROOT)/output/build -maxdepth 2 -type d -regex ".*/busybox-[0-9]+\.[0-9]+\.[0-9]+$$")
-endef
-
 .PHONY: all generate disassemble install clean cleanDTB cleanDriver test
 
 all:
@@ -46,8 +38,7 @@ all:
 
 # Temp rule for debugging
 test:
-	@echo $(linuxDir)
-	@echo $(busyboxDir)
+	echo $(shell find $(BUILDROOT)/output/build -maxdepth 2 -type d -regex ".*/linux-[0-9]+\.[0-9]+\.[0-9]+$$")
 
 generate: $(DTB) $(IMAGES)
 
@@ -74,11 +65,13 @@ $(DIS)/%.objdump: $(IMAGES)/%.elf
 $(DIS)/%.objdump: $(IMAGES)/%
 	riscv64-unknown-elf-objdump -S $< >> $@
 
-$(IMAGES)/vmlinux: $(call linuxDir)/vmlinux
-	cp $< $@
+$(IMAGES)/vmlinux:
+	linuxDir=$$(find $(BUILDROOT)/output/build -maxdepth 2 -type d -regex ".*/linux-[0-9]+\.[0-9]+\.[0-9]+$$") ;\
+	cp $$linuxDir/vmlinux $@ ;\
 
-$(IMAGES)/busybox: $(call busyboxDir)/busybox
-	cp $< $@
+$(IMAGES)/busybox:
+	busyboxDir=$$(find $(BUILDROOT)/output/build -maxdepth 2 -type d -regex ".*/busybox-[0-9]+\.[0-9]+\.[0-9]+$$") ;\
+	cp $$busyboxDir/busybox $@ ;\
 
 # Generating new Buildroot directories --------------------------------
 
diff --git a/testbench/testbench.sv b/testbench/testbench.sv
index 186144839..6dd9f3d2f 100644
--- a/testbench/testbench.sv
+++ b/testbench/testbench.sv
@@ -389,6 +389,7 @@ module testbench;
 
     assign SDCCmd = SDCCmdOE ? SDCCmdOut : 1'bz;
     assign SDCCmdIn = SDCCmd;
+    assign SDCDat = sd_dat_reg_t ? sd_dat_reg_o : sd_dat_i;
     assign SDCDatIn = SDCDat;
  -----/\----- EXCLUDED -----/\----- */
     assign SDCIntr = '0;