diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
index e765e1b30..6987f67ad 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
@@ -325,6 +325,9 @@ public class UHC extends TeamGame
 		this.WorldData.MinZ = -_borders;
 		this.WorldData.MaxZ = _borders;
 		
+		this.WorldData.MinY = -1000;
+		this.WorldData.MaxY = 1000;
+		
 		for (int y=0 ; y<128 ; y++)
 			for (int x=-_borders ; x<_borders ; x++)
 				for (int z=-_borders ; z<_borders ; z++)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
index 7eb6ea80e..9783d4459 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
@@ -61,10 +61,10 @@ public class GameChatManager implements Listener
 
 		//Rank Prefix
 		String rankStr = "";
-		if  (rank != Rank.ALL)
+		if  (rank != Rank.ALL && (Manager.GetGame() != null && Manager.GetGame().GetType() != GameType.UHC))
 			rankStr = rank.GetTag(true, true) + " ";
 
-		if (ownsUltra && !rank.Has(Rank.ULTRA))
+		if (ownsUltra && !rank.Has(Rank.ULTRA) && (Manager.GetGame() != null && Manager.GetGame().GetType() != GameType.UHC))
 			rankStr = Rank.ULTRA.GetTag(true, true) + " ";
 		
 		//Base Format