diff -Nru munt-2.0.4+git1727+date201710030117~ubuntu15.04.1/debian/bzr-builder.manifest munt-2.0.4+git1729+date201710071331~ubuntu15.04.1/debian/bzr-builder.manifest
--- munt-2.0.4+git1727+date201710030117~ubuntu15.04.1/debian/bzr-builder.manifest	2017-10-03 01:17:23.000000000 +0000
+++ munt-2.0.4+git1729+date201710071331~ubuntu15.04.1/debian/bzr-builder.manifest	2017-10-07 13:31:46.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}+git1727+date201710030117
-lp:munt revid:git-v1:466d284cf29845ecfde93692dfc09b917faa6c5b
+# bzr-builder format 0.3 deb-version {debupstream}+git1729+date201710071331
+lp:munt revid:git-v1:eec5a69f892482931b54a81660e7682b5806a080
 merge packaging lp:~i30817/+junk/mt32emu_packaging revid:i30817@gmail.com-20170311124800-34x1n473wv4kjc2b
diff -Nru munt-2.0.4+git1727+date201710030117~ubuntu15.04.1/debian/changelog munt-2.0.4+git1729+date201710071331~ubuntu15.04.1/debian/changelog
--- munt-2.0.4+git1727+date201710030117~ubuntu15.04.1/debian/changelog	2017-10-03 01:17:23.000000000 +0000
+++ munt-2.0.4+git1729+date201710071331~ubuntu15.04.1/debian/changelog	2017-10-07 13:31:46.000000000 +0000
@@ -1,8 +1,8 @@
-munt (2.0.4+git1727+date201710030117~ubuntu15.04.1) vivid; urgency=low
+munt (2.0.4+git1729+date201710071331~ubuntu15.04.1) vivid; urgency=low
 
   * Auto build.
 
- -- i30817 <i30817@gmail.com>  Tue, 03 Oct 2017 01:17:23 +0000
+ -- i30817 <i30817@gmail.com>  Sat, 07 Oct 2017 13:31:46 +0000
 
 munt (2.0.4-ppa) raring; urgency=low
 
diff -Nru munt-2.0.4+git1727+date201710030117~ubuntu15.04.1/mt32emu/src/Synth.cpp munt-2.0.4+git1729+date201710071331~ubuntu15.04.1/mt32emu/src/Synth.cpp
--- munt-2.0.4+git1727+date201710030117~ubuntu15.04.1/mt32emu/src/Synth.cpp	2017-10-03 01:17:21.000000000 +0000
+++ munt-2.0.4+git1729+date201710071331~ubuntu15.04.1/mt32emu/src/Synth.cpp	2017-10-07 13:31:45.000000000 +0000
@@ -1212,22 +1212,22 @@
 #endif
 		if (/*addr >= MT32EMU_MEMADDR(0x000000) && */addr < MT32EMU_MEMADDR(0x010000)) {
 			addr += MT32EMU_MEMADDR(0x030000);
-			Bit8u *parts = extensions.chantable[device];
-			if (*parts > 8) {
+			Bit8u *chanParts = extensions.chantable[device];
+			if (*chanParts > 8) {
 #if MT32EMU_MONITOR_SYSEX > 0
 				printDebug(" (Channel not mapped to a part... 0 offset)");
 #endif
 			} else {
 				for (Bit32u partIx = 0; partIx <= 8; partIx++) {
-					if (parts[partIx] > 8) break;
+					if (chanParts[partIx] > 8) break;
 					int offset;
-					if (parts[partIx] == 8) {
+					if (chanParts[partIx] == 8) {
 #if MT32EMU_MONITOR_SYSEX > 0
 						printDebug(" (Channel mapped to rhythm... 0 offset)");
 #endif
 						offset = 0;
 					} else {
-						offset = parts[partIx] * sizeof(MemParams::PatchTemp);
+						offset = chanParts[partIx] * sizeof(MemParams::PatchTemp);
 #if MT32EMU_MONITOR_SYSEX > 0
 						printDebug(" (Setting extra offset to %d)", offset);
 #endif
@@ -1240,22 +1240,22 @@
 			addr += MT32EMU_MEMADDR(0x030110) - MT32EMU_MEMADDR(0x010000);
 		} else if (/*addr >= MT32EMU_MEMADDR(0x020000) && */ addr < MT32EMU_MEMADDR(0x030000)) {
 			addr += MT32EMU_MEMADDR(0x040000) - MT32EMU_MEMADDR(0x020000);
-			Bit8u *parts = extensions.chantable[device];
-			if (*parts > 8) {
+			Bit8u *chanParts = extensions.chantable[device];
+			if (*chanParts > 8) {
 #if MT32EMU_MONITOR_SYSEX > 0
 				printDebug(" (Channel not mapped to a part... 0 offset)");
 #endif
 			} else {
 				for (Bit32u partIx = 0; partIx <= 8; partIx++) {
-					if (parts[partIx] > 8) break;
+					if (chanParts[partIx] > 8) break;
 					int offset;
-					if (parts[partIx] == 8) {
+					if (chanParts[partIx] == 8) {
 #if MT32EMU_MONITOR_SYSEX > 0
 						printDebug(" (Channel mapped to rhythm... 0 offset)");
 #endif
 						offset = 0;
 					} else {
-						offset = parts[partIx] * sizeof(TimbreParam);
+						offset = chanParts[partIx] * sizeof(TimbreParam);
 #if MT32EMU_MONITOR_SYSEX > 0
 						printDebug(" (Setting extra offset to %d)", offset);
 #endif
@@ -1688,10 +1688,10 @@
 		}
 		Bit8u chan = mt32ram.system.chanAssign[i];
 		if (chan > 15) continue;
-		Bit8u *parts = extensions.chantable[chan];
+		Bit8u *chanParts = extensions.chantable[chan];
 		for (Bit32u j = 0; j <= 8; j++) {
-			if (parts[j] > 8) {
-				parts[j] = Bit8u(i);
+			if (chanParts[j] > 8) {
+				chanParts[j] = Bit8u(i);
 				break;
 			}
 		}
diff -Nru munt-2.0.4+git1727+date201710030117~ubuntu15.04.1/mt32emu_qt/src/mididrv/Win32Driver.cpp munt-2.0.4+git1729+date201710071331~ubuntu15.04.1/mt32emu_qt/src/mididrv/Win32Driver.cpp
--- munt-2.0.4+git1727+date201710030117~ubuntu15.04.1/mt32emu_qt/src/mididrv/Win32Driver.cpp	2017-10-03 01:17:21.000000000 +0000
+++ munt-2.0.4+git1729+date201710071331~ubuntu15.04.1/mt32emu_qt/src/mididrv/Win32Driver.cpp	2017-10-07 13:31:45.000000000 +0000
@@ -220,11 +220,16 @@
 		qDebug() << "Win32MidiDriver: Error registering message class";
 	}
 
-#ifndef HWND_MESSAGE
-#define HWND_MESSAGE ((HWND)-3)
+#if _WIN32_WINNT < 0x0500
+#define HWND_MESSAGE NULL
 #endif
 
 	hwnd = CreateWindow(mt32emuClassName, "mt32emu_message_window", 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, hInstance, NULL);
+
+#if _WIN32_WINNT < 0x0500
+#undef HWND_MESSAGE
+#endif
+
 	if (hwnd == NULL) {
 		DWORD err = GetLastError();
 		qDebug() << "Win32MidiDriver: Error creating message window" << err;