diff --git a/.clang-tidy b/.clang-tidy
index 6b599afe0ad94c2c0e674f186945788cdf352e17..cbbe3d7e05ce568cc1a0e8ed9f1577f010fdb6a3 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -11,7 +11,8 @@
 # As we are not aware of an official way to insert comments in a long string literal,
 # we do a dirty little trick: we write comments as if they were no-check specifiers.
 #
-Checks: '*,
+Checks: '
+
 
 -SectionComment_We_disagree_with_the_following_checks__They_shall_remain_permanently_disabled,
 
@@ -30,6 +31,7 @@ Checks: '*,
 -clang-analyzer-alpha.deadcode.UnreachableCode,
 -clang-analyzer-security.insecureAPI.strcpy,
 -cppcoreguidelines-init-variables,
+-cppcoreguidelines-macro-usage,
 -cppcoreguidelines-non-private-member-variables-in-classes,
 -cppcoreguidelines-pro-bounds-constant-array-index,
 -cppcoreguidelines-pro-bounds-pointer-arithmetic,
@@ -51,12 +53,15 @@ Checks: '*,
 -performance-unnecessary-value-param,
 -readability-use-anyofallof,
 
+
 -SectionComment_Disabled_unless_3rdparty_libraries_are_improved,
 
+-clang-analyzer-cplusplus.NewDeleteLeaks,
 -cppcoreguidelines-avoid-non-const-global-variables,
 -llvm-include-order,
 -readability-redundant-access-specifiers,
 
+
 -SectionComment_Resolving_the_following_checks_would_be_too_much_work_right_now,
 
 -cppcoreguidelines-owning-memory,
@@ -79,7 +84,7 @@ Checks: '*,
 -*-statically-constructed-objects,
 -*-use-auto,
 -*-use-emplace,
--*-use-override,
++*-use-override,
 -bugprone-argument-comment,
 -bugprone-copy-constructor-init,
 -bugprone-exception-escape,
@@ -88,18 +93,11 @@ Checks: '*,
 -bugprone-narrowing-conversions,
 -bugprone-unhandled-self-assignment,
 -bugprone-unused-return-value,
--bugprone-use-after-move,
--bugprone-parent-virtual-call,
--cert-dcl21-cpp,
--cert-msc30-c,
--cert-msc50-cpp,
--cert-oop54-cpp,
--clang-analyzer-core.CallAndMessage,
--clang-analyzer-cplusplus.NewDeleteLeaks,
--clang-analyzer-optin.cplusplus.VirtualCall,
--cppcoreguidelines-explicit-virtual-functions,
--cppcoreguidelines-init-variables,
--cppcoreguidelines-macro-usage,
++bugprone-parent-virtual-call,
++clang-analyzer-core.CallAndMessage,
++clang-analyzer-optin.cplusplus.VirtualCall,
++cppcoreguidelines-explicit-virtual-functions,
++cppcoreguidelines-init-variables,
 -cppcoreguidelines-pro-type-const-cast,
 -cppcoreguidelines-pro-type-cstyle-cast,
 -cppcoreguidelines-pro-type-static-cast-downcast,
diff --git a/App/main.cpp b/App/main.cpp
index 59431d8c85621ba6b484c22a407257ef4c3651df..43d85e01475b94994f00bdcbff468847c492b6df 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -43,9 +43,9 @@ int main(int argc, char* argv[])
         QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 
     QApplication app(argc, argv);
-    app.setApplicationName("BornAgain");
-    app.setApplicationVersion(GUI::Util::Path::getBornAgainVersionString());
-    app.setOrganizationName("BornAgain");
+    QApplication::setApplicationName("BornAgain");
+    QApplication::setApplicationVersion(GUI::Util::Path::getBornAgainVersionString());
+    QApplication::setOrganizationName("BornAgain");
     if (!GUI::Util::OS::HostOsInfo::isMacHost())
         QApplication::setWindowIcon(QIcon(":/images/BornAgain.ico"));