diff --git a/src/comm/QGCJSBSimLink.cc b/src/comm/QGCJSBSimLink.cc
index 8f0f23084287861ab60cb7f7a79019925edba6ca..c50e517e224e128dbe047b30ee0d8894f263036d 100644
--- a/src/comm/QGCJSBSimLink.cc
+++ b/src/comm/QGCJSBSimLink.cc
@@ -241,8 +241,7 @@ void QGCJSBSimLink::readBytes()
 
         // Echo data for debugging purposes
         std::cerr << __FILE__ << __LINE__ << "Received datagram:" << std::endl;
-        int i;
-        for (i=0; i<s; i++)
+        for (unsigned int i=0; i<s; i++)
         {
             unsigned int v=data[i];
             fprintf(stderr,"%02x ", v);
diff --git a/src/ui/MAVLinkDecoder.cc b/src/ui/MAVLinkDecoder.cc
index 4a753ff79d7d04988376e4893cc94a136295ca9a..2b3798271aa5b83b7f027426ebc5dcb99f7d8778 100644
--- a/src/ui/MAVLinkDecoder.cc
+++ b/src/ui/MAVLinkDecoder.cc
@@ -87,7 +87,7 @@ void MAVLinkDecoder::receiveMessage(LinkInterface* link,mavlink_message_t messag
     time = getUnixTimeFromMs(message.sysid, time);
 
     // Send out all field values for this message
-    for (int i = 0; i < messageInfo[msgid].num_fields; ++i)
+    for (unsigned int i = 0; i < messageInfo[msgid].num_fields; ++i)
     {
         emitFieldValue(&message, i, time);
     }