diff --git a/deps/libtomcrypt b/deps/libtomcrypt
index 824f3af9..c39390db 160000
--- a/deps/libtomcrypt
+++ b/deps/libtomcrypt
@@ -1 +1 @@
-Subproject commit 824f3af98c68880ba2d186d0632996730dd58a98
+Subproject commit c39390dba1dc519988fe8f6b1af6fdec24f86fc5
diff --git a/deps/protobuf b/deps/protobuf
index b4b0e304..17174b54 160000
--- a/deps/protobuf
+++ b/deps/protobuf
@@ -1 +1 @@
-Subproject commit b4b0e304be5a68de3d0ee1af9b286f958750f5e4
+Subproject commit 17174b54ddd040a326dec6db75d1bfb5e5b3caa9
diff --git a/src/Components/Modules/Changelog.cpp b/src/Components/Modules/Changelog.cpp
index 4e7ee826..6dc2d719 100644
--- a/src/Components/Modules/Changelog.cpp
+++ b/src/Components/Modules/Changelog.cpp
@@ -51,6 +51,8 @@ namespace Components
 
 	Changelog::Changelog()
 	{
+		if (Dedicated::IsEnabled()) return;
+
 		// Changelog
 		UIFeeder::Add(62.0f, Changelog::GetChangelogCount, Changelog::GetChangelogText, Changelog::SelectChangelog);
 	}
diff --git a/src/Components/Modules/ConnectProtocol.cpp b/src/Components/Modules/ConnectProtocol.cpp
index 445f9b65..a570a6fd 100644
--- a/src/Components/Modules/ConnectProtocol.cpp
+++ b/src/Components/Modules/ConnectProtocol.cpp
@@ -204,6 +204,8 @@ namespace Components
 
 	ConnectProtocol::ConnectProtocol()
 	{
+		if (Dedicated::IsEnabled()) return;
+
 		// IPC handler
 		IPCPipe::On("connect", [] (std::string data)
 		{
diff --git a/src/Components/Modules/D3D9Ex.cpp b/src/Components/Modules/D3D9Ex.cpp
index 6526cf30..d5281324 100644
--- a/src/Components/Modules/D3D9Ex.cpp
+++ b/src/Components/Modules/D3D9Ex.cpp
@@ -745,6 +745,8 @@ namespace Components
 
 	D3D9Ex::D3D9Ex()
 	{
+		if (Dedicated::IsEnabled()) return;
+
 		Dvar::Register<bool>("r_useD3D9Ex", true, Game::dvar_flag::DVAR_FLAG_SAVED, "Use extended d3d9 interface!");
 
 		// Hook Interface creation
diff --git a/src/Components/Modules/Friends.cpp b/src/Components/Modules/Friends.cpp
index 1a113903..3444a341 100644
--- a/src/Components/Modules/Friends.cpp
+++ b/src/Components/Modules/Friends.cpp
@@ -535,6 +535,7 @@ namespace Components
 		Friends::LoggedOn = false;
 
 		if (Dedicated::IsEnabled() ||ZoneBuilder::IsEnabled()) return;
+
 		Dvar::Register<bool>("cl_anonymous", false, Game::DVAR_FLAG_SAVED, "");
 		Dvar::Register<int>("cl_notifyFriendState", 1, -1, 1, Game::DVAR_FLAG_SAVED, "");
 
diff --git a/src/Components/Modules/ModList.cpp b/src/Components/Modules/ModList.cpp
index 9cfcfdd9..d090b679 100644
--- a/src/Components/Modules/ModList.cpp
+++ b/src/Components/Modules/ModList.cpp
@@ -90,6 +90,8 @@ namespace Components
 
 	ModList::ModList()
 	{
+		if (Dedicated::IsEnabled()) return;
+
 		ModList::CurrentMod = 0;
 		Dvar::Register("cl_modVidRestart", true, Game::dvar_flag::DVAR_FLAG_SAVED, "Perform a vid_restart when loading a mod.");
 
diff --git a/src/Components/Modules/News.cpp b/src/Components/Modules/News.cpp
index 51ee2436..c16b32fc 100644
--- a/src/Components/Modules/News.cpp
+++ b/src/Components/Modules/News.cpp
@@ -172,7 +172,7 @@ namespace Components
 		News::UpdaterArgs.clear();
 		News::UpdaterHash.clear();
 		News::UpdaterRefresh = 0;
-		if (ZoneBuilder::IsEnabled()) return; // Maybe also dedi?
+		if (ZoneBuilder::IsEnabled() || Dedicated::IsEnabled()) return; // Maybe also dedi?
 
 		Dvar::Register<bool>("g_firstLaunch", true, Game::DVAR_FLAG_SAVED, "");
 
diff --git a/src/Components/Modules/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp
index 8bd4aa7b..6691067b 100644
--- a/src/Components/Modules/QuickPatch.cpp
+++ b/src/Components/Modules/QuickPatch.cpp
@@ -66,6 +66,8 @@ namespace Components
 
 	void QuickPatch::UnlockStats()
 	{
+		if (Dedicated::IsEnabled()) return;
+
 		if (Game::CL_IsCgameInitialized())
 		{
 			Toast::Show("cardicon_locked", "^1Error", "Not allowed while ingame.", 3000);
diff --git a/src/Components/Modules/Renderer.cpp b/src/Components/Modules/Renderer.cpp
index f6af1fcb..3f190679 100644
--- a/src/Components/Modules/Renderer.cpp
+++ b/src/Components/Modules/Renderer.cpp
@@ -94,6 +94,8 @@ namespace Components
 
 	Renderer::Renderer()
 	{
+		if (Dedicated::IsEnabled()) return;
+
 // 		Renderer::OnBackendFrame([] (IDirect3DDevice9* device)
 // 		{
 // 			if (Game::Sys_Milliseconds() % 2)
diff --git a/src/Components/Modules/UIFeeder.cpp b/src/Components/Modules/UIFeeder.cpp
index ad39e43d..8d6e7dc6 100644
--- a/src/Components/Modules/UIFeeder.cpp
+++ b/src/Components/Modules/UIFeeder.cpp
@@ -379,6 +379,8 @@ namespace Components
 
 	UIFeeder::UIFeeder()
 	{
+		if (Dedicated::IsEnabled()) return;
+
 		Dvar::OnInit([]()
 		{
 			Dvar::Register<const char*>("ui_map_long", "Afghan", Game::dvar_flag::DVAR_FLAG_NONE, "");
diff --git a/src/Components/Modules/UIScript.cpp b/src/Components/Modules/UIScript.cpp
index 95f118e8..923772b4 100644
--- a/src/Components/Modules/UIScript.cpp
+++ b/src/Components/Modules/UIScript.cpp
@@ -116,6 +116,8 @@ namespace Components
 
 	UIScript::UIScript()
 	{
+		if (Dedicated::IsEnabled()) return;
+
 		// Install handler
 		Utils::Hook::RedirectJump(0x45EC59, UIScript::RunMenuScriptStub);