diff --git a/arts/midi/rawmidiport_impl.cc b/arts/midi/rawmidiport_impl.cc
index 3d82d8b..f8311bd 100644
--- a/arts/midi/rawmidiport_impl.cc
+++ b/arts/midi/rawmidiport_impl.cc
@@ -289,7 +289,7 @@ public:
 	}
 	void processCommand(const MidiCommand& command)
 	{
-		char message[3] = { command.status, command.data1, command.data2 };
+		unsigned char message[3] = { command.status, command.data1, command.data2 };
 
 		int len = midiMsgLen(command.status);
 		if(midiMsgLen(command.status))
diff --git a/mpeglib/lib/mpegplay/mpegVideoStream.cpp b/mpeglib/lib/mpegplay/mpegVideoStream.cpp
index 5e16b11..a37288e 100644
--- a/mpeglib/lib/mpegplay/mpegVideoStream.cpp
+++ b/mpeglib/lib/mpegplay/mpegVideoStream.cpp
@@ -81,7 +81,7 @@ int MpegVideoStream::isStartCode(unsigned int data) {
   case SEQUENCE_ERROR_CODE:
   case SYSTEM_HEADER_START_CODE:   
   case ISO_11172_END_CODE:  
-  case EOF:  
+  case (0U | EOF):
     return true;
   }
   if ((SLICE_MIN_START_CODE < data) && (data < SLICE_MAX_START_CODE)) {