diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp
index e51966de1f6..3fd76298406 100644
--- a/addon/doxyapp/doxyapp.cpp
+++ b/addon/doxyapp/doxyapp.cpp
@@ -146,7 +146,7 @@ static void listSymbol(Definition *d)
 
 static void listSymbols()
 {
-  for (const auto &kv : Doxygen::symbolMap)
+  for (const auto &kv : *Doxygen::symbolMap)
   {
     listSymbol(kv.second);
   }
@@ -205,7 +205,7 @@ static void lookupSymbols(const QCString &sym)
 {
   if (!sym.isEmpty())
   {
-    auto range = Doxygen::symbolMap.find(sym);
+    auto range = Doxygen::symbolMap->find(sym);
     bool found=false;
     for (auto it=range.first; it!=range.second; ++it)
     {
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 3f56900f646..d593703094d 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -671,7 +671,7 @@ bool DocParser::findDocsForMemberOrCompound(const QCString &commandName,
       cmdArg.startsWith("anonymous_namespace{")
       )
   {
-    int rightBracePos = cmdArg.find("}", std::strlen("anonymous_namespace{"));
+    size_t rightBracePos = cmdArg.find("}", std::strlen("anonymous_namespace{"));
     QCString leftPart = cmdArg.left(rightBracePos + 1);
     QCString rightPart = cmdArg.right(cmdArg.size() - rightBracePos - 1);
     rightPart = substitute(rightPart, ".", "::");
diff --git a/src/util.cpp b/src/util.cpp
index fcf1a836dd5..3dc8aaaf19a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -5989,14 +5989,14 @@ int countAliasArguments(const QCString &argList)
   return count;
 }
 
-QCString extractAliasArgs(const QCString &args,int pos)
+QCString extractAliasArgs(const QCString &args,size_t pos)
 {
-  int i;
+  size_t i;
   int bc=0;
   char prevChar=0;
   if (args.at(pos)=='{') // alias has argument
   {
-    for (i=pos;i<(int)args.length();i++)
+    for (i=pos;i<args.length();i++)
     {
       if (prevChar!='\\')
       {
diff --git a/src/util.h b/src/util.h
index a166a2106fd..1b63377d745 100644
--- a/src/util.h
+++ b/src/util.h
@@ -346,7 +346,7 @@ QCString transcodeCharacterStringToUTF8(const QCString &input);
 
 QCString recodeString(const QCString &str,const char *fromEncoding,const char *toEncoding);
 
-QCString extractAliasArgs(const QCString &args,int pos);
+QCString extractAliasArgs(const QCString &args,size_t pos);
 
 int countAliasArguments(const QCString &argList);