diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index ca171fbbd..b9c40ad84 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -925,7 +925,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
         mSettings->checkAllConfigurations = true;
 
     if (mSettings->force)
-        mSettings->maxConfigs = ~0U;
+        mSettings->maxConfigs = INT_MAX;
 
     else if ((def || mSettings->preprocessOnly) && !maxconfigs)
         mSettings->maxConfigs = 1U;
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 307327bb0..3001214ff 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -641,7 +641,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
         }
 
         std::set<unsigned long long> checksums;
-        unsigned int checkCount = 0;
+        int checkCount = 0;
         bool hasValidConfig = false;
         std::list<std::string> configurationError;
         for (const std::string &currCfg : configurations) {
@@ -1259,7 +1259,7 @@ Settings &CppCheck::settings()
     return mSettings;
 }
 
-void CppCheck::tooManyConfigsError(const std::string &file, const std::size_t numberOfConfigurations)
+void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfConfigurations)
 {
     if (!mSettings.isEnabled(Settings::INFORMATION) && !mTooManyConfigs)
         return;
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index 9b727b02b..e202b51e4 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -118,7 +118,7 @@ public:
      */
     void getErrorMessages();
 
-    void tooManyConfigsError(const std::string &file, const std::size_t numberOfConfigurations);
+    void tooManyConfigsError(const std::string &file, const int numberOfConfigurations);
     void purgedConfigurationMessage(const std::string &file, const std::string& configuration);
 
     void dontSimplify() {