diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 0a66c3950b2..e14a76dda10 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -412,7 +412,6 @@ void IMuseDigital::parseScriptCmds(int a, int b, int c, int d, int e, int f, int
 	int cmd = a;
 	int soundId = b;
 	int sub_cmd = c;
-	int chan = -1;
 
 	if (!cmd)
 		return;
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp
index cf7033a38be..b854b5c482e 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/scumm/imuse_digi/dimuse_music.cpp
@@ -37,7 +37,7 @@ void IMuseDigital::setDigMusicState(int stateId) {
 	}
 
 	if (num == -1) {
-		for (l = 0; _digStateMusicMap[l].roomId != -1; l++) {
+		for (l = 0; /* _digStateMusicMap[l].roomId != -1 */ ; l++) {	// FIXME comparing an unsigned int with -1, are we? :-)
 			if ((_digStateMusicMap[l].roomId == stateId)) {
 				break;
 			}
diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp
index c1b6703dcad..537db77be09 100644
--- a/scumm/imuse_digi/dimuse_tables.cpp
+++ b/scumm/imuse_digi/dimuse_tables.cpp
@@ -148,7 +148,7 @@ const imuseRoomMap _digStateMusicMap[] = {
 	{45,  1,  0,  0,  0,  0 },
 	{87,  1,  0,  0,  0,  0 },
 	{111, 1,  0,  0,  0,  0 },
-	{-1,  1,  0,  0,  0,  0 }
+	{0xff,  1,  0,  0,  0,  0 }
 };
 
 const imuseDigTable _digStateMusicTable[] = {