diff --git a/src/raspberrypi/Makefile b/src/raspberrypi/Makefile
index 17774269..70811a1c 100644
--- a/src/raspberrypi/Makefile
+++ b/src/raspberrypi/Makefile
@@ -64,10 +64,12 @@ OS_FILES = ./os_integration
 OBJDIR := ./obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
 BINDIR := ./bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
 
-#BIN_ALL = $(RASCSI) $(RASCTL) $(RASDUMP) $(SASIDUMP) $(SCSIMON)
-# Temporarily remove the RASDUMP and RASDUMP tools, since they're not needed
-# for my specific use case. If you need them - add them back in!
-BIN_ALL = $(BINDIR)/$(RASCSI) $(BINDIR)/$(RASCTL) $(BINDIR)/$(SCSIMON)
+BIN_ALL = \
+	$(BINDIR)/$(RASCSI) \
+	$(BINDIR)/$(RASCTL) \
+	$(BINDIR)/$(SCSIMON) \
+	$(BINDIR)/$(RASDUMP) \
+	$(BINDIR)/$(SASIDUMP)
 
 SRC_PROTOC = \
 	rascsi_interface.proto
diff --git a/src/raspberrypi/rasdump.cpp b/src/raspberrypi/rasdump.cpp
index 585d6abd..1667e5db 100644
--- a/src/raspberrypi/rasdump.cpp
+++ b/src/raspberrypi/rasdump.cpp
@@ -9,6 +9,7 @@
 //
 //---------------------------------------------------------------------------
 
+#include <errno.h>
 #include "os.h"
 #include "fileio.h"
 #include "filepath.h"
@@ -282,7 +283,7 @@ bool Command(BYTE *buf, int length)
 	}
 
 	// Send Command
-	count = bus.SendHandShake(buf, length);
+	count = bus.SendHandShake(buf, length, BUS::SEND_NO_DELAY);
 
 	// Success if the transmission result is the same as the number 
 	// of requests
@@ -323,7 +324,7 @@ int DataOut(BYTE *buf, int length)
 	}
 
 	// Data transmission
-	return bus.SendHandShake(buf, length);
+	return bus.SendHandShake(buf, length, BUS::SEND_NO_DELAY);
 }
 
 //---------------------------------------------------------------------------
diff --git a/src/raspberrypi/sasidump.cpp b/src/raspberrypi/sasidump.cpp
index 88ef1fdb..847945a4 100644
--- a/src/raspberrypi/sasidump.cpp
+++ b/src/raspberrypi/sasidump.cpp
@@ -18,6 +18,7 @@
 //
 //---------------------------------------------------------------------------
 
+#include <errno.h>
 #include "os.h"
 #include "fileio.h"
 #include "filepath.h"
@@ -269,7 +270,7 @@ bool Command(BYTE *buf, int length)
 	}
 
 	// Send command
-	count = bus.SendHandShake(buf, length);
+	count = bus.SendHandShake(buf, length, BUS::SEND_NO_DELAY);
 
 	// Return true is send results match number of requests
 	if (count == length) {
@@ -309,7 +310,7 @@ int DataOut(BYTE *buf, int length)
 	}
 
 	// Receive data
-	return bus.SendHandShake(buf, length);
+	return bus.SendHandShake(buf, length, BUS::SEND_NO_DELAY);
 }
 
 //---------------------------------------------------------------------------