diff --git a/MapValidator/Source/MapValidator.as b/MapValidator/Source/MapValidator.as
index 13f6a65..92a6843 100644
--- a/MapValidator/Source/MapValidator.as
+++ b/MapValidator/Source/MapValidator.as
@@ -72,7 +72,7 @@ void Render() {
 		CGameCtnChallenge@ map = cast<CGameCtnChallenge>(GetApp().Challenge);
 #endif
 
-	if (map is null && editor is null) {
+	if (map is null || editor is null) {
 		menu_visibility = false;
 		return;
 	}
@@ -118,7 +118,7 @@ void RenderMenu() {
 		CGameCtnChallenge@ map = cast<CGameCtnChallenge>(GetApp().Challenge);
 #endif
 
-	if (map is null && editor is null) {
+	if (map is null || editor is null) {
 		return;
 	}
 
diff --git a/TMWTInterfacesRemover/main.as b/TMWTInterfacesRemover/main.as
index 6b7c5dc..c814260 100644
--- a/TMWTInterfacesRemover/main.as
+++ b/TMWTInterfacesRemover/main.as
@@ -50,10 +50,10 @@ void Main() {
             CGameManiaAppPlayground@ ManiaApp = cast<CGameManiaAppPlayground>(network.ClientManiaAppPlayground);
             if (ManiaApp !is null) {
                 if (UILayer_LiveRanking is null) {
-                    @UILayer_LiveRanking = findUILayer(ManiaApp.UILayers, "UIModule_TMWTTeams_LiveRanking");
+                    @UILayer_LiveRanking = findUILayer(ManiaApp.UILayers, "UIModule_TMWTCommon_LiveRanking");
                 }
                 if (UILayer_TeamsScores is null) {
-                    @UILayer_TeamsScores = findUILayer(ManiaApp.UILayers, "UIModule_TMWTTeams_Header");
+                    @UILayer_TeamsScores = findUILayer(ManiaApp.UILayers, "UIModule_TMWTCommon_Header");
                 }
                 if (UILayer_TeamsScores is null && UILayer_LiveRanking is null) {
                     UI::ShowNotification("\\$77d" + Icons::User + " \\$fffTMWT Interfaces Remover", "Can't find Interfaces to hide, disabling the plugin");