diff --git a/Minecraft.Client/PlayerList.cpp b/Minecraft.Client/PlayerList.cpp
index 4dd3a0c3..c3d12dbd 100644
--- a/Minecraft.Client/PlayerList.cpp
+++ b/Minecraft.Client/PlayerList.cpp
@@ -86,7 +86,7 @@ PlayerList::~PlayerList()
 
 bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer> player, shared_ptr<LoginPacket> packet)
 {
-	// todo: we should move emit player join event here
+	// (SYLV)todo: we should move emit player join event here
 	CompoundTag *playerTag = load(player);
 
 	bool newPlayer = playerTag == nullptr;
diff --git a/Minecraft.Client/TrackedEntity.cpp b/Minecraft.Client/TrackedEntity.cpp
index 60b0ca24..3aa33248 100644
--- a/Minecraft.Client/TrackedEntity.cpp
+++ b/Minecraft.Client/TrackedEntity.cpp
@@ -653,11 +653,11 @@ shared_ptr<Packet> TrackedEntity::getAddEntityPacket()
 
 		PlayerUID xuid = INVALID_XUID;
 		PlayerUID OnlineXuid = INVALID_XUID;
-		//if( player != nullptr )
-		//{
-		//	xuid = player->getXuid();
-		//	OnlineXuid = player->getOnlineXuid();
-		//}
+		if( player != nullptr )
+		{
+			xuid = player->getXuid();
+			OnlineXuid = player->getOnlineXuid();
+		}
 		// 4J Added yHeadRotp param to fix #102563 - TU12: Content: Gameplay: When one of the Players is idle for a few minutes his head turns 180 degrees.
 		return std::make_shared<AddPlayerPacket>(player, xuid, OnlineXuid, xp, yp, zp, yRotp, xRotp, yHeadRotp);
 	}
diff --git a/Minecraft.World/LivingEntity.cpp b/Minecraft.World/LivingEntity.cpp
index eb37a084..72d3faa4 100644
--- a/Minecraft.World/LivingEntity.cpp
+++ b/Minecraft.World/LivingEntity.cpp
@@ -775,7 +775,7 @@ bool LivingEntity::hurt(DamageSource *source, float dmg)
 
 #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
 	{
-		// todo: map these properly
+		// (SYLV)todo: map these properly
 
 		int entityTypeId = FourKitBridge::MapEntityType((int)GetType());
 		int dimId = level->dimension ? level->dimension->id : 0;