diff --git a/r5dev/src/CCompanion.cpp b/r5dev/src/CCompanion.cpp
index c9a6f732..ba7c2dfb 100644
--- a/r5dev/src/CCompanion.cpp
+++ b/r5dev/src/CCompanion.cpp
@@ -213,7 +213,7 @@ void CCompanion::ServerBrowserSection()
     const float FooterHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
     ImGui::BeginChild("ServerListChild", { 0, -FooterHeight }, true, ImGuiWindowFlags_AlwaysVerticalScrollbar);
     {
-        ImGui::BeginTable("##ServerBrowser_ServerList", 4, ImGuiTableFlags_Resizable);
+        if (ImGui::BeginTable("##ServerBrowser_ServerList", 4, ImGuiTableFlags_Resizable))
         {
             ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthStretch, 35);
             ImGui::TableSetupColumn("Map", ImGuiTableColumnFlags_WidthStretch, 25);
@@ -251,8 +251,8 @@ void CCompanion::ServerBrowserSection()
                     }
                 }
             }
+            ImGui::EndTable();
         }
-        ImGui::EndTable();
     }
     ImGui::EndChild();
 
diff --git a/r5dev/src/id3dx.cpp b/r5dev/src/id3dx.cpp
index 31d176e4..c09b3492 100644
--- a/r5dev/src/id3dx.cpp
+++ b/r5dev/src/id3dx.cpp
@@ -484,14 +484,14 @@ void InstallDXHooks()
 	///////////////////////////////////////////////////////////////////////////////
 	// Hook SwapChain
 	MH_CreateHook(g_fnIDXGISwapChainPresent, &Present, reinterpret_cast<void**>(&originalPresent));
-	MH_CreateHook(g_oResizeBuffers, &GetResizeBuffers, reinterpret_cast<void**>(&originalResizeBuffers));
+//	MH_CreateHook(g_oResizeBuffers, &GetResizeBuffers, reinterpret_cast<void**>(&originalResizeBuffers));
 	 
 	///////////////////////////////////////////////////////////////////////////////
 	// Enable hooks
 	MH_EnableHook(PostMessageA);
 	MH_EnableHook(PostMessageW);
 	MH_EnableHook(g_fnIDXGISwapChainPresent);
-	MH_EnableHook(g_oResizeBuffers);
+//	MH_EnableHook(g_oResizeBuffers);
 }
 
 void RemoveDXHooks()
@@ -512,7 +512,7 @@ void RemoveDXHooks()
 	///////////////////////////////////////////////////////////////////////////////
 	// Unhook SwapChain
 	MH_RemoveHook(g_fnIDXGISwapChainPresent);
-	MH_RemoveHook(g_oResizeBuffers);
+//	MH_RemoveHook(g_oResizeBuffers);
 
 	///////////////////////////////////////////////////////////////////////////////
 	// Shutdown ImGui