diff --git a/include/crlib/cr-hook.h b/include/crlib/cr-hook.h
index 2ec4e35..fd93da8 100644
--- a/include/crlib/cr-hook.h
+++ b/include/crlib/cr-hook.h
@@ -30,8 +30,8 @@ private:
    uint32 m_origFunc;
    uint32 m_hookFunc;
 
-   uint8 m_origBytes[CodeLength];
-   uint8 m_hookBytes[CodeLength];
+   uint8 m_origBytes[CodeLength] {};
+   uint8 m_hookBytes[CodeLength] {};
 
 private:
    void setPageSize () {
@@ -64,7 +64,7 @@ private:
    }
 
 public:
-   SimpleHook () : m_patched (false), m_origFunc (0), m_hookFunc (0), m_pageSize (0) {
+   SimpleHook () : m_patched (false), m_pageSize (0), m_origFunc (0), m_hookFunc (0) {
       setPageSize ();
    }
 
diff --git a/include/crlib/cr-http.h b/include/crlib/cr-http.h
index 69d5914..ae2e602 100644
--- a/include/crlib/cr-http.h
+++ b/include/crlib/cr-http.h
@@ -151,7 +151,7 @@ public:
       return static_cast <int32> (sendLength);
 #else
       iovec iov = { const_cast <void *> (message), length };
-      msghdr msg = { 0, };
+      msghdr msg {};
 
       msg.msg_name = reinterpret_cast <void *> (const_cast <struct sockaddr *> (dest));
       msg.msg_namelen = destLength;
diff --git a/include/engine.h b/include/engine.h
index df2d994..c50cc15 100644
--- a/include/engine.h
+++ b/include/engine.h
@@ -304,8 +304,8 @@ public:
    int getTeam (edict_t *ent);
 
    // adds translation pair from config
-   void addTranslation (const String &m_origBytes, const String &translated) {
-      m_language.push (m_origBytes, translated);
+   void addTranslation (const String &original, const String &translated) {
+      m_language.push (original, translated);
    }
 
    // clear the translation table
diff --git a/include/yapb.h b/include/yapb.h
index 23cd693..928dde5 100644
--- a/include/yapb.h
+++ b/include/yapb.h
@@ -8,7 +8,7 @@
 //
 
 #pragma once
-#define _CRTDBG_MAP_ALLOC
+
 #include <engine/extdll.h>
 #include <engine/meta_api.h>
 
diff --git a/source/graph.cpp b/source/graph.cpp
index e297405..9aa9f2f 100644
--- a/source/graph.cpp
+++ b/source/graph.cpp
@@ -1,5 +1,3 @@
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 //
 // Yet Another POD-Bot, based on PODBot by Markus Klinge ("CountFloyd").
 // Copyright (c) YaPB Development Team.