diff --git a/CMakeLists.txt b/CMakeLists.txt
index b22980e..daa38ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ project(Textractor)
 add_compile_options(
   /std:c++17
   /MP
+  /wd4018 # signed/unsigned mismatch
 )
 
 add_definitions(
diff --git a/GUI/extenwindow.h b/GUI/extenwindow.h
index 3d51de7..921dc52 100644
--- a/GUI/extenwindow.h
+++ b/GUI/extenwindow.h
@@ -20,9 +20,9 @@ public:
 private:
 	void Add(QFileInfo extenFile);
 	void Sync();
-	bool eventFilter(QObject* target, QEvent* event);
-	void dragEnterEvent(QDragEnterEvent* event);
-	void dropEvent(QDropEvent* event);
+	bool eventFilter(QObject* target, QEvent* event) override;
+	void dragEnterEvent(QDragEnterEvent* event) override;
+	void dropEvent(QDropEvent* event) override;
 
 	Ui::ExtenWindow* ui;
 };
diff --git a/include/const.h b/include/const.h
index 15dc2b1..2815543 100644
--- a/include/const.h
+++ b/include/const.h
@@ -6,24 +6,6 @@
 
 enum { MESSAGE_SIZE = 500, PIPE_BUFFER_SIZE = 2000, SHIFT_JIS = 932, MAX_MODULE_SIZE = 120, HOOK_NAME_SIZE = 30 };
 
-// jichi 375/2014: Add offset of pusha/pushad
-// http://faydoc.tripod.com/cpu/pushad.htm
-// http://agth.wikia.com/wiki/Cheat_Engine_AGTH_Tutorial
-//
-// Warning: The offset in ITH has -4 offset comparing to pusha and AGTH
-enum pusha_off 
-{
-	pusha_eax_off = -0x4,
-	pusha_ecx_off = -0x8,
-	pusha_edx_off = -0xc,
-	pusha_ebx_off = -0x10,
-	pusha_esp_off = -0x14,
-	pusha_ebp_off = -0x18,
-	pusha_esi_off = -0x1c,
-	pusha_edi_off = -0x20,
-	pusha_off = -0x24 // pushad offset
-};
-
 enum HostCommandType 
 {
 	HOST_COMMAND = -1, // null type
diff --git a/vnrhook/engine/engine.cc b/vnrhook/engine/engine.cc
index 39f0c8d..89b50ea 100644
--- a/vnrhook/engine/engine.cc
+++ b/vnrhook/engine/engine.cc
@@ -25,6 +25,23 @@
 #include <cstdio>
 #include <string>
 
+// jichi 375/2014: Add offset of pusha/pushad
+// http://faydoc.tripod.com/cpu/pushad.htm
+// http://agth.wikia.com/wiki/Cheat_Engine_AGTH_Tutorial
+//
+// Warning: The offset in ITH has -4 offset comparing to pusha and AGTH
+enum pusha_off
+{
+	pusha_eax_off = -0x4,
+	pusha_ecx_off = -0x8,
+	pusha_edx_off = -0xc,
+	pusha_ebx_off = -0x10,
+	pusha_esp_off = -0x14,
+	pusha_ebp_off = -0x18,
+	pusha_esi_off = -0x1c,
+	pusha_edi_off = -0x20,
+	pusha_off = -0x24 // pushad offset
+};
 
 // jichi 7/6/2014: read esp_base
 #define retof(esp_base)         *(DWORD *)(esp_base) // return address
diff --git a/vnrhook/texthook.cc b/vnrhook/texthook.cc
index 362d897..fadcf10 100644
--- a/vnrhook/texthook.cc
+++ b/vnrhook/texthook.cc
@@ -3,12 +3,6 @@
 // Branch: ITH_DLL/texthook.cpp, rev 128
 // 8/24/2013 TODO: Clean up this file
 
-#ifdef _MSC_VER
-# pragma warning (disable:4100)   // C4100: unreference formal parameter
-# pragma warning (disable:4018)   // C4018: sign/unsigned mismatch
-//# pragma warning (disable:4733)   // C4733: Inline asm assigning to 'FS:0' : handler not registered as safe handler
-#endif // _MSC_VER
-
 #include "texthook.h"
 #include "MinHook.h"
 #include "engine/match.h"
@@ -17,8 +11,6 @@
 #include "defs.h"
 #include "text.h"
 #include "ithsys/ithsys.h"
-#include "growl.h"
-#include <Psapi.h>
 
 extern std::unique_ptr<WinMutex> viewMutex;
 
diff --git a/vnrhook/util/util.cc b/vnrhook/util/util.cc
index 3d5dd73..a33736a 100644
--- a/vnrhook/util/util.cc
+++ b/vnrhook/util/util.cc
@@ -37,7 +37,6 @@ uint64_t SafeSearchMemory(uint64_t startAddr, uint64_t endAddr, const BYTE* byte
 	__except (EXCEPTION_EXECUTE_HANDLER)
 	{
 		ConsoleOutput("Textractor: SearchMemory ERROR (Textractor will likely still work fine, but please let Artikash know if this happens a lot!)");
-		return 0;
 	}
 	return 0;
 }