diff --git a/code/XFileParser.cpp b/code/XFileParser.cpp
index 86074e256..e7bf8518c 100644
--- a/code/XFileParser.cpp
+++ b/code/XFileParser.cpp
@@ -472,7 +472,7 @@ void XFileParser::ParseDataObjectMesh( Mesh* pMesh)
         Face& face = pMesh->mPosFaces[a];
         for (unsigned int b = 0; b < numIndices; ++b) {
             const int idx( ReadInt() );
-            if ( idx <= numVertices ) {
+            if ( static_cast<unsigned int>( idx ) <= numVertices ) {
                 face.mIndices.push_back( idx );
             }
         }
@@ -1309,7 +1309,7 @@ unsigned int XFileParser::ReadInt()
 
         --mBinaryNumCount;
         const size_t len( mEnd - mP );
-        if ( mEnd - mP >= 4) {
+        if ( len >= 4) {
             return ReadBinDWord();
         } else {
             mP = mEnd;