diff --git a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/npcinfo/NpcInfoLarge.kt b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/npcinfo/NpcInfoLarge.kt
index 87e934a1e..758d478e1 100644
--- a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/npcinfo/NpcInfoLarge.kt
+++ b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/npcinfo/NpcInfoLarge.kt
@@ -25,6 +25,6 @@ public class NpcInfoLarge(buffer: ByteBuf) : DefaultByteBufHolder(buffer), Outgo
     }
 
     override fun toString(): String {
-        return "NpcInfoLarge() ${super.toString()}"
+        return super.toString()
     }
 }
diff --git a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/npcinfo/NpcInfoSmall.kt b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/npcinfo/NpcInfoSmall.kt
index 86e8776df..6f1dd932e 100644
--- a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/npcinfo/NpcInfoSmall.kt
+++ b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/npcinfo/NpcInfoSmall.kt
@@ -25,6 +25,6 @@ public class NpcInfoSmall(buffer: ByteBuf) : DefaultByteBufHolder(buffer), Outgo
     }
 
     override fun toString(): String {
-        return "NpcInfoSmall() ${super.toString()}"
+        return super.toString()
     }
 }
diff --git a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/playerinfo/PlayerInfoPacket.kt b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/playerinfo/PlayerInfoPacket.kt
index 342cf57d1..9465dcf93 100644
--- a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/playerinfo/PlayerInfoPacket.kt
+++ b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/info/playerinfo/PlayerInfoPacket.kt
@@ -29,6 +29,6 @@ public class PlayerInfoPacket(
     }
 
     override fun toString(): String {
-        return "PlayerInfoPacket() ${super.toString()}"
+        return super.toString()
     }
 }
diff --git a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/interfaces/IfSetEvents.kt b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/interfaces/IfSetEvents.kt
index 39be8875a..e31fb8218 100644
--- a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/interfaces/IfSetEvents.kt
+++ b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/interfaces/IfSetEvents.kt
@@ -43,4 +43,36 @@ public class IfSetEvents private constructor(
         get() = _end.toInt()
     override val category: ServerProtCategory
         get() = GameServerProtCategory.LOW_PRIORITY_PROT
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as IfSetEvents
+
+        if (combinedId != other.combinedId) return false
+        if (_start != other._start) return false
+        if (_end != other._end) return false
+        if (events != other.events) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = combinedId.hashCode()
+        result = 31 * result + _start.hashCode()
+        result = 31 * result + _end.hashCode()
+        result = 31 * result + events
+        return result
+    }
+
+    override fun toString(): String {
+        return "IfSetEvents(" +
+            "events=$events, " +
+            "interfaceId=$interfaceId, " +
+            "componentId=$componentId, " +
+            "start=$start, " +
+            "end=$end" +
+            ")"
+    }
 }
diff --git a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/map/RebuildLogin.kt b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/map/RebuildLogin.kt
index d13bf02fb..f77874bf1 100644
--- a/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/map/RebuildLogin.kt
+++ b/protocol/osrs-221-model/src/main/kotlin/net/rsprot/protocol/game/outgoing/map/RebuildLogin.kt
@@ -64,7 +64,7 @@ public class RebuildLogin private constructor(
     }
 
     override fun toString(): String {
-        return "RebuildNormal(" +
+        return "RebuildLogin(" +
             "zoneX=$zoneX, " +
             "zoneZ=$zoneZ, " +
             "keys=$keys, " +