diff --git a/src/Base/BaseClass.h b/src/Base/BaseClass.h
index af78ec9aaa..a058ca600e 100644
--- a/src/Base/BaseClass.h
+++ b/src/Base/BaseClass.h
@@ -166,7 +166,7 @@ public:
     }
 
 private:
-    static Type classTypeId;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+    static Type classTypeId;  // NOLINT
 
 protected:
     static void initSubclass(Base::Type& toInit,
diff --git a/src/Base/BaseClassPyImp.cpp b/src/Base/BaseClassPyImp.cpp
index e444c0c84a..d432672264 100644
--- a/src/Base/BaseClassPyImp.cpp
+++ b/src/Base/BaseClassPyImp.cpp
@@ -43,11 +43,9 @@ PyObject* BaseClassPy::isDerivedFrom(PyObject* args)
         return nullptr;
     }
 
-    // clang-format off
     Base::Type type = Base::Type::fromName(name);
-    bool valid = (type != Base::Type::badType() && getBaseClassPtr()->getTypeId().isDerivedFrom(type));
+    bool valid = (type != Base::Type::badType() && getBaseClassPtr()->isDerivedFrom(type));
     return PyBool_FromLong(valid ? 1 : 0);
-    // clang-format on
 }
 
 PyObject* BaseClassPy::getAllDerivedFrom(PyObject* args)
diff --git a/src/Base/Matrix.cpp b/src/Base/Matrix.cpp
index 655623ba41..a530b46708 100644
--- a/src/Base/Matrix.cpp
+++ b/src/Base/Matrix.cpp
@@ -634,7 +634,12 @@ void Matrix4D::inverseOrthogonal()
 void Matrix4D::inverseGauss()
 {
     double matrix[16];
-    double inversematrix[16] = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1};
+    // clang-format off
+    double inversematrix[16] = {1, 0, 0, 0,
+                                0, 1, 0, 0,
+                                0, 0, 1, 0,
+                                0, 0, 0, 1};
+    // clang-format on
     getGLMatrix(matrix);
 
     Matrix_gauss(matrix, inversematrix);