diff --git a/.clang-tidy b/.clang-tidy
index 9ac2c70c51790bc0b7f901f22283eac8381aaca4..ec8ca4c8a98397a6b86a00693795fbd1e0797989 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -39,7 +39,8 @@ readability-deleted-default,
 readability-misleading-indentation,
 readability-misplaced-array-index,
 readability-redundant-control-flow,
-readability-redundant-smartptr-get
+readability-redundant-smartptr-get,
+readability-static-accessed-through-instance
 
 '
 WarningsAsErrors: '*'
diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp
index e136e64ec77cee71bfe2ed3a4c603e1e2e31e1d8..dfd7a683484a605ce9c9b6e66b9752ff2c86d01f 100644
--- a/src/core/config/Config.cpp
+++ b/src/core/config/Config.cpp
@@ -271,16 +271,16 @@ void Config::parseFromFile( const char* filename, Block& block, unsigned int lev
       else if( std::getline( input, value, ';' ) && !input.eof() )
       {
          input.ignore( 1 );
-         while( (value.find("$(") != value.npos) && (value.find(')') != value.npos) ) {
+         while( (value.find("$(") != std::string::npos) && (value.find(')') != std::string::npos) ) {
             size_t s = value.find("$("); size_t e = value.find(')');
             ValueReplacementMap::iterator mkey = valueReplacements_.find( value.substr( s+2, e-s+1-3 ) );
             if(mkey != valueReplacements_.end()) {
                value.replace( s,e-s+1, mkey->second );
             }
             else {
-               if(e!=value.npos)
+               if(e!=std::string::npos)
                   value.erase(e,1);
-               if(s!=value.npos)
+               if(s!=std::string::npos)
                   value.erase(s,2);
             }
          }
@@ -404,16 +404,16 @@ void Config::extractBlock( const char* filename, std::stringstream& input, Block
       else if( std::getline( input, value, ';' ) && !input.eof() )
       {
          input.ignore( 1 );
-         while( (value.find("$(") != value.npos) && (value.find(')') != value.npos) ) {
+         while( (value.find("$(") != std::string::npos) && (value.find(')') != std::string::npos) ) {
             size_t s = value.find("$("); size_t e = value.find(')');
             ValueReplacementMap::iterator mkey = valueReplacements_.find( value.substr( s+2, e-s+1-3 ) );
             if(mkey != valueReplacements_.end()) {
                value.replace( s,e-s+1, mkey->second );
             }
             else {
-               if(e!=value.npos)
+               if(e!=std::string::npos)
                   value.erase(e,1);
-               if(s!=value.npos)
+               if(s!=std::string::npos)
                   value.erase(s,2);
             }
          }