diff --git a/.clang-tidy b/.clang-tidy
index 90c72765ca..1f37003f8e 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,7 @@
 Checks: >
   -*,
   portability-*,
+  -portability-template-virtual-member-function,
   clang-analyzer-*,
   -clang-analyzer-optin.*,
   -clang-analyzer-cplusplus.NewDeleteLeaks,
@@ -16,4 +17,4 @@ CheckOptions:
 - key: readability-identifier-naming.NamespaceCase
   value: CamelCase
 - key: readability-identifier-naming.NamespaceIgnoredRegexp
-  value: 'osg(DB|FX|Particle|Shadow|Viewer|Util)?'
+  value: 'bpo|osg(DB|FX|Particle|Shadow|Viewer|Util)?'
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index a8dee709da..4b8e7acd61 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -9,8 +9,6 @@
 #include <fstream>
 #include <iostream>
 
-namespace sfs = std::filesystem;
-
 namespace
 {
     // from configfileparser.cpp
diff --git a/apps/mwiniimporter/main.cpp b/apps/mwiniimporter/main.cpp
index 6e4242cb4e..c5f21ac67f 100644
--- a/apps/mwiniimporter/main.cpp
+++ b/apps/mwiniimporter/main.cpp
@@ -10,7 +10,6 @@
 #include <components/files/conversion.hpp>
 
 namespace bpo = boost::program_options;
-namespace sfs = std::filesystem;
 
 #ifndef _WIN32
 int main(int argc, char* argv[])
diff --git a/components/esmterrain/gridsampling.hpp b/components/esmterrain/gridsampling.hpp
index e71dfc5152..86544a214b 100644
--- a/components/esmterrain/gridsampling.hpp
+++ b/components/esmterrain/gridsampling.hpp
@@ -15,7 +15,9 @@ namespace ESMTerrain
     inline std::pair<std::size_t, std::size_t> toCellAndLocal(
         std::size_t begin, std::size_t global, std::size_t cellSize)
     {
+        // NOLINTBEGIN(clang-analyzer-core.UndefinedBinaryOperatorResult)
         std::size_t cell = global / (cellSize - 1);
+        // NOLINTEND(clang-analyzer-core.UndefinedBinaryOperatorResult)
         std::size_t local = global & (cellSize - 2);
         if (global != begin && local == 0)
         {