diff --git a/src/pcm/pcm_dmix_i386.h b/src/pcm/pcm_dmix_i386.h
index 9ea155d9..462371a5 100644
--- a/src/pcm/pcm_dmix_i386.h
+++ b/src/pcm/pcm_dmix_i386.h
@@ -400,8 +400,8 @@ static void MIX_AREAS_24(unsigned int size,
 		"\tmovzwl (%%esi), %%ecx\n"
 		"\tmovl (%%ebx), %%edx\n"
 		"\tsall $16, %%eax\n"
+		"\torl %%eax, %%ecx\n"
 		"\t" LOCK_PREFIX "btsw $0, (%%edi)\n"
-		"\tleal (%%ecx,%%eax,1), %%ecx\n"
 		"\tjc 2f\n"
 		"\t" XSUB " %%edx, %%ecx\n"
 		"2:"
diff --git a/src/pcm/pcm_dmix_x86_64.h b/src/pcm/pcm_dmix_x86_64.h
index b4d0a412..ab40f50a 100644
--- a/src/pcm/pcm_dmix_x86_64.h
+++ b/src/pcm/pcm_dmix_x86_64.h
@@ -284,11 +284,11 @@ static void MIX_AREAS_24(unsigned int size,
 		 *   *sum += sample;
 		 */
 		"\tmovsbl 2(%%rsi), %%eax\n"
-		"\tmovswl (%%rsi), %%ecx\n"
+		"\tmovzwl (%%rsi), %%ecx\n"
 		"\tmovl (%%rbx), %%edx\n"
 		"\tsall $16, %%eax\n"
+		"\torl %%eax, %%ecx\n"
 		"\t" LOCK_PREFIX "btsw $0, (%%rdi)\n"
-		"\t.byte 0x67, 0x8d, 0x0c, 0x01\n"
 		"\tjc 2f\n"
 		"\t" XSUB " %%edx, %%ecx\n"
 		"2:"
diff --git a/src/seq/seq_midi_event.c b/src/seq/seq_midi_event.c
index b5caa1b8..53d05725 100644
--- a/src/seq/seq_midi_event.c
+++ b/src/seq/seq_midi_event.c
@@ -442,6 +442,7 @@ long snd_midi_event_decode(snd_midi_event_t *dev, unsigned char *buf, long count
 
 
 	if (cmd == MIDI_CMD_COMMON_SYSEX) {
+		snd_midi_event_reset_decode(dev);
 		qlen = ev->data.ext.len;
 		if (count < qlen)
 			return -ENOMEM;
@@ -566,10 +567,10 @@ static int extra_decode_xrpn(snd_midi_event_t *dev, unsigned char *buf, int coun
 	if (dev->nostat && count < 12)
 		return -ENOMEM;
 	cmd = MIDI_CMD_CONTROL|(ev->data.control.channel & 0x0f);
-	bytes[0] = ev->data.control.param & 0x007f;
-	bytes[1] = (ev->data.control.param & 0x3f80) >> 7;
-	bytes[2] = ev->data.control.value & 0x007f;
-	bytes[3] = (ev->data.control.value & 0x3f80) >> 7;
+	bytes[0] = (ev->data.control.param & 0x3f80) >> 7;
+	bytes[1] = ev->data.control.param & 0x007f;
+	bytes[2] = (ev->data.control.value & 0x3f80) >> 7;
+	bytes[3] = ev->data.control.value & 0x007f;
 	if (cmd != dev->lastcmd && !dev->nostat) {
 		if (count < 9)
 			return -ENOMEM;