diff --git a/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile b/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile
index a6b501148c..4f95991daf 100644
--- a/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile
@@ -78,16 +78,5 @@ Package haiku-echo3g-cvs
 	:
 	boot home config add-ons kernel drivers bin ;
 
-Package haiku-echo3g-cvs
-	:
-	<kernel!drivers!dev!audio!multi>echo3g
-	:
-	boot home config add-ons kernel drivers dev audio multi ;
+PackageDriverSymLink haiku-echo3g-cvs : audio multi echo3g ;
 
-# Link to kernel/drivers/dev/audio/multi
-{
-	local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev audio multi ] ;
-	local instDriver = <kernel!drivers!dev!audio!multi>echo3g ;
-	MakeLocate $(instDriver) : $(dir) ;
-	RelSymLink $(instDriver) : echo3g ;
-}
diff --git a/src/add-ons/kernel/drivers/audio/echo/indigo/Jamfile b/src/add-ons/kernel/drivers/audio/echo/indigo/Jamfile
index 3df1de048e..8fbf85dcd0 100644
--- a/src/add-ons/kernel/drivers/audio/echo/indigo/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/echo/indigo/Jamfile
@@ -77,16 +77,5 @@ Package haiku-echoindigo-cvs
 	:
 	boot home config add-ons kernel drivers bin ;
 
-Package haiku-echoindigo-cvs
-	:
-	<kernel!drivers!dev!audio!multi>echoindigo
-	:
-	boot home config add-ons kernel drivers dev audio multi ;
+PackageDriverSymLink haiku-echoindigo-cvs : audio multi echoindigo ;
 
-# Link to kernel/drivers/dev/audio/multi
-{
-	local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev audio multi ] ;
-	local instDriver = <kernel!drivers!dev!audio!multi>echoindigo ;
-	MakeLocate $(instDriver) : $(dir) ;
-	RelSymLink $(instDriver) : echoindigo ;
-}
diff --git a/src/add-ons/kernel/drivers/audio/echo/midi.cpp b/src/add-ons/kernel/drivers/audio/echo/midi.cpp
index ebbdde2500..bd4088740f 100644
--- a/src/add-ons/kernel/drivers/audio/echo/midi.cpp
+++ b/src/add-ons/kernel/drivers/audio/echo/midi.cpp
@@ -125,6 +125,7 @@ midi_read(
 	ECHOSTATUS 		err;
 	DWORD			midiData;
 	LONGLONG 		timestamp;
+	PBYTE			next = (PBYTE)ptr;
 	
 	LOG(("midi_read()\n"));
 	
@@ -134,8 +135,8 @@ midi_read(
 	err = card->pEG->ReadMidiByte(&card->midi.context, midiData, timestamp);
 	if (err == ECHOSTATUS_OK) {
 		*nread = 1;
-		*(PDWORD)ptr = midiData;
-		LOG(("midi_read() : 0x%lx\n", midiData));
+		*next = midiData;
+		LOG(("midi_read() : 0x%lx\n", *next));
 		return B_OK;
 	}
 	return B_ERROR;