diff --git a/gui/tabs/settings_tab.cpp b/gui/tabs/settings_tab.cpp
index 5ff91cf6..6e04103c 100644
--- a/gui/tabs/settings_tab.cpp
+++ b/gui/tabs/settings_tab.cpp
@@ -7,7 +7,7 @@ namespace SettingsTab {
 			ImGui::Dummy(ImVec2(4, 4));
 			ImGui::Text("Change Theme Color:");
 			ImGui::Dummy(ImVec2(4, 4));
-			ImGui::PushItemWidth(ImGui::GetWindowWidth() / 3.5);
+			ImGui::PushItemWidth(ImGui::GetWindowWidth() / 3.5f);
 			ImGui::ColorPicker4("##picker", (float*)&State.SelectedColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
 			ImGui::PopItemWidth();
 
diff --git a/gui/theme.hpp b/gui/theme.hpp
index b31cd381..19ede2ab 100644
--- a/gui/theme.hpp
+++ b/gui/theme.hpp
@@ -11,12 +11,12 @@ ImVec4 HI(float v) {
 
 ImVec4 MED(float v) {
 	ImVec4 vec = State.SelectedColor;
-	return ImVec4(vec.x / 1.5, vec.y / 1.5, vec.z / 1.5, v);
+	return ImVec4(vec.x / 1.5f, vec.y / 1.5f, vec.z / 1.5f, v);
 }
 
 ImVec4 LOW(float v) {
 	ImVec4 vec = State.SelectedColor;
-	return ImVec4(vec.x / 2, vec.y / 2, vec.z / 2, v);
+	return ImVec4(vec.x / 2.0f, vec.y / 2.0f, vec.z / 2.0f, v);
 }
 
 #define BG(v)   ImVec4(0.200f, 0.220f, 0.270f, v)
diff --git a/hooks/HudManager.cpp b/hooks/HudManager.cpp
index 305a8fac..8a2df6af 100644
--- a/hooks/HudManager.cpp
+++ b/hooks/HudManager.cpp
@@ -5,10 +5,10 @@ using namespace app;
 void dHudManager_ShowMap(HudManager* __this, Action_1_MapBehaviour_* mapAction, MethodInfo* method) {
 	HudManager_ShowMap(__this, mapAction, method);
 
-	if (State.ChatAlwaysActive)
-		ChatController_SetVisible(__this->fields.Chat, true, NULL);
-	else
-		ChatController_SetVisible(__this->fields.Chat, false, NULL);
+	//if (State.ChatAlwaysActive)
+	//	ChatController_SetVisible(__this->fields.Chat, true, NULL);
+	//else
+	//	ChatController_SetVisible(__this->fields.Chat, false, NULL);
 }
 
 void dHudManager_Update(HudManager* __this,  MethodInfo* method) {
diff --git a/user/state.hpp b/user/state.hpp
index 44da6674..26736611 100644
--- a/user/state.hpp
+++ b/user/state.hpp
@@ -75,6 +75,7 @@ class Settings {
 
 	std::vector<PlayerControl*> impostors = { nullptr, nullptr, nullptr };
 	int map = -1;
+	ShipStatus_MapType__Enum previousMap = (ShipStatus_MapType__Enum) 0;
 	int impostors_amount = 0;
 
 	bool Wallhack = false;