diff --git a/.clang-tidy b/.clang-tidy
index 92713b6..66eea28 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -21,6 +21,7 @@ Checks: '
     -misc-no-recursion,
     -misc-redundant-expression,
     -misc-unused-parameters,
+    -misc-use-anonymous-namespace,
     modernize-*,
     -modernize-avoid-c-arrays,
     -modernize-deprecated-headers,
@@ -28,6 +29,7 @@ Checks: '
     -modernize-raw-string-literal,
     -modernize-return-braced-init-list,
     -modernize-use-auto,
+    -modernize-use-emplace,
     -modernize-use-nullptr,
     -modernize-use-trailing-return-type,
     -modernize-use-using,
@@ -35,6 +37,7 @@ Checks: '
     -performance-no-int-to-ptr,
     portability-*,
     readability-*,
+    -readability-braces-around-statements,
     -readability-else-after-return,
     -readability-function-cognitive-complexity,
     -readability-function-size,
diff --git a/src/curl.cpp b/src/curl.cpp
index 41ad01d..a5117b3 100644
--- a/src/curl.cpp
+++ b/src/curl.cpp
@@ -1095,14 +1095,14 @@ bool S3fsCurl::SetProxy(const char* url)
         pos = 0;
     }
     // check fqdn and port number string
-    if(std::string::npos != (pos = tmpurl.find(":", pos))){
+    if(std::string::npos != (pos = tmpurl.find(':', pos))){
         // specify port
         if(0 == pos){
             // no fqdn(hostname) string before ":"
             return false;
         }
         pos += strlen(":");
-        if(std::string::npos != tmpurl.find(":", pos)){
+        if(std::string::npos != tmpurl.find(':', pos)){
             // found wrong separator
             return false;
         }
diff --git a/src/s3fs.cpp b/src/s3fs.cpp
index c18cb6a..2e41a06 100644
--- a/src/s3fs.cpp
+++ b/src/s3fs.cpp
@@ -5300,7 +5300,7 @@ int main(int argc, char* argv[])
 #elif defined(__APPLE__)
     bucket_size=static_cast<fsblkcnt_t>(INT32_MAX);
 #else
-    bucket_size=static_cast<fsblkcnt_t>(~0);
+    bucket_size=~0U;
 #endif