diff --git a/src/client/component/arxan.cpp b/src/client/component/arxan.cpp
index ea894414..7454d4b1 100644
--- a/src/client/component/arxan.cpp
+++ b/src/client/component/arxan.cpp
@@ -608,11 +608,13 @@ namespace arxan
 
 		void post_unpack() override
 		{
-			/*patch_check_type_1_direct();
+			/*
+			patch_check_type_1_direct();
 			patch_check_type_1_indirect();
 			patch_check_type_2();
 			patch_check_type_4();
-			patch_check_type_5();*/
+			patch_check_type_5();
+			*/
 		}
 
 		void pre_destroy() override
diff --git a/src/client/component/scheduler.cpp b/src/client/component/scheduler.cpp
index 47bda262..f7c693dd 100644
--- a/src/client/component/scheduler.cpp
+++ b/src/client/component/scheduler.cpp
@@ -150,7 +150,7 @@ namespace scheduler
 	class component final : public component_interface
 	{
 	public:
-		void pre_start() override
+		void post_unpack() override
 		{
 			thread = utils::thread::create_named_thread("Async Scheduler", []()
 			{
diff --git a/src/client/component/splash.cpp b/src/client/component/splash.cpp
index a6fee292..7cc211de 100644
--- a/src/client/component/splash.cpp
+++ b/src/client/component/splash.cpp
@@ -32,9 +32,8 @@ namespace splash
 	{
 	public:
 		component()
+			: image_(load_splash_image())
 		{
-			image_ = load_splash_image();
-
 			enable_dpi_awareness();
 			this->show();
 		}
diff --git a/src/client/main.cpp b/src/client/main.cpp
index f2278bf4..ef43dc33 100644
--- a/src/client/main.cpp
+++ b/src/client/main.cpp
@@ -174,13 +174,12 @@ namespace
 
 	int patch_main()
 	{
-		initialization_hooks.clear();
-
 		if(!run())
 		{
 			return 1;
 		}
 
+		initialization_hooks.clear();
 		return reinterpret_cast<int(*)()>(get_entry_point())();
 	}