diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index d4fa76bed..7dab93ecd 100644
--- a/lib/checkbufferoverrun.cpp
+++ b/lib/checkbufferoverrun.cpp
@@ -287,7 +287,7 @@ static bool checkMinSizes(const std::list<Library::ArgumentChecks::MinSize> &min
         case Library::ArgumentChecks::MinSize::ARGVALUE:
             if (Token::Match(argtok, "%num% ,|)")) {
                 const MathLib::bigint sz = MathLib::toLongNumber(argtok->str());
-                if (sz > arraySize)
+                if ((std::size_t)sz > arraySize)
                     error = true;
             } else if (argtok->type() == Token::eChar && Token::Match(argtok->next(), ",|)") && charSizeToken)
                 *charSizeToken = argtok; //sizeArgumentAsCharError(argtok);
@@ -296,7 +296,7 @@ static bool checkMinSizes(const std::list<Library::ArgumentChecks::MinSize> &min
             // TODO: handle arbitrary arg2
             if (minsize->arg2 == minsize->arg+1 && Token::Match(argtok, "%num% , %num% ,|)")) {
                 const MathLib::bigint sz = MathLib::toLongNumber(argtok->str()) * MathLib::toLongNumber(argtok->strAt(2));
-                if (sz > arraySize)
+                if ((std::size_t)sz > arraySize)
                     error = true;
             }
             break;
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 6c697722a..fafb3a901 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -77,7 +77,7 @@ unsigned int TokenList::appendFileIfNew(const std::string &fileName)
     // Has this file been tokenized already?
     for (std::size_t i = 0; i < _files.size(); ++i)
         if (Path::sameFileName(_files[i], fileName))
-            return i;
+            return (unsigned int)i;
 
     // The "_files" vector remembers what files have been tokenized..
     _files.push_back(Path::simplifyPath(fileName));