diff --git a/.clang-tidy b/.clang-tidy
index 2c7285bc..66ea44a6 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -2,10 +2,9 @@ Checks: "
   -*,
 
   bugprone-*,
-  -bugprone-easily-swappable-parameters,
+  -bugprone-easily-swappable-parameters, /* This is a bit excessive. */
 
   cert-*,
-  -cert-err58-cpp,
 
   clang-analyzer-*,
 
@@ -14,18 +13,17 @@ Checks: "
 
   cppcoreguidelines-*,
   -cppcoreguidelines-avoid-magic-numbers,
-  -cppcoreguidelines-avoid-non-const-global-variables,
-  -cppcoreguidelines-init-variables,
   -cppcoreguidelines-pro-bounds-constant-array-index,
   -cppcoreguidelines-pro-type-member-init,
   -cppcoreguidelines-pro-type-reinterpret-cast,
   -cppcoreguidelines-pro-type-union-access,
   -cppcoreguidelines-pro-type-vararg,
   -cppcoreguidelines-special-member-functions,
+  -cppcoreguidelines-avoid-non-const-global-variables, /* This is hard to avoid. */
 
   google-*,
   -google-default-arguments,
-  -google-build-using-namespace,
+  -google-build-using-namespace, /* This cannot be resolved while using gmock-global. */
 
   hicpp-*,
   -hicpp-member-init,
diff --git a/src/agnocastlib/src/agnocast_publisher.cpp b/src/agnocastlib/src/agnocast_publisher.cpp
index f1bd577c..21ac10a2 100644
--- a/src/agnocastlib/src/agnocast_publisher.cpp
+++ b/src/agnocastlib/src/agnocast_publisher.cpp
@@ -69,7 +69,7 @@ void publish_core(
     uint32_t pid = publish_args.ret_pids[i];
 
     const std::string mq_name = create_mq_name(topic_name, pid);
-    mqd_t mq;
+    mqd_t mq = 0;
     if (opened_mqs.find(mq_name) != opened_mqs.end()) {
       mq = opened_mqs[mq_name];
     } else {
diff --git a/src/agnocastlib/src/agnocast_topic_info.cpp b/src/agnocastlib/src/agnocast_topic_info.cpp
index f71d342f..a40dfdfe 100644
--- a/src/agnocastlib/src/agnocast_topic_info.cpp
+++ b/src/agnocastlib/src/agnocast_topic_info.cpp
@@ -13,8 +13,8 @@ std::shared_ptr<std::function<void()>> create_callable(
   const void * ptr, const uint32_t publisher_pid, const uint64_t timestamp,
   const uint32_t topic_local_id)
 {
-  bool found;
-  AgnocastTopicInfo * info;
+  bool found = false;
+  AgnocastTopicInfo * info = nullptr;
 
   {
     std::lock_guard<std::mutex> lock(id2_topic_mq_info_mtx);