diff --git a/MCGalaxy/Commands/CPE/CmdSkin.cs b/MCGalaxy/Commands/CPE/CmdSkin.cs
index 6d1e7fb0a..194eeb395 100644
--- a/MCGalaxy/Commands/CPE/CmdSkin.cs
+++ b/MCGalaxy/Commands/CPE/CmdSkin.cs
@@ -49,7 +49,7 @@ namespace MCGalaxy.Commands.CPE {
         protected override void SetPlayerData(Player p, Player who, string skin) {
             skin = GetSkin(skin, who.truename);
             who.SkinName = skin;
-            Entities.GlobalRespawn(p);
+            Entities.GlobalRespawn(who);
             
             if (p != who) {
                 Player.GlobalMessage(who, who.ColoredName + "'s %Sskin was changed to &c" + skin);
diff --git a/MCGalaxy/Commands/Chat/CmdColor.cs b/MCGalaxy/Commands/Chat/CmdColor.cs
index fdd4a37cb..ef79e9de2 100644
--- a/MCGalaxy/Commands/Chat/CmdColor.cs
+++ b/MCGalaxy/Commands/Chat/CmdColor.cs
@@ -63,7 +63,7 @@ namespace MCGalaxy.Commands.Chatting {
                 who.color = color;
             }
             
-            Entities.GlobalRespawn(p);
+            Entities.GlobalRespawn(who);
             who.SetPrefix();
             Database.Backend.UpdateRows("Players", "color = @1", "WHERE Name = @0", who.name, color);
         }
diff --git a/MCGalaxy/Network/Heartbeat/ClassiCube.cs b/MCGalaxy/Network/Heartbeat/ClassiCube.cs
index 6e10a0767..75c1c428c 100644
--- a/MCGalaxy/Network/Heartbeat/ClassiCube.cs
+++ b/MCGalaxy/Network/Heartbeat/ClassiCube.cs
@@ -61,7 +61,6 @@ namespace MCGalaxy.Network {
         public override string GetHeartbeatData()  {
             string name = ServerConfig.Name;
             Server.zombie.OnHeartbeat(ref name);
-            Server.lava.OnHeartbeat(ref name);
             name = Colors.StripColors(name);
             
             return "&port="  + ServerConfig.Port +