diff --git a/Source/Framework/IO/ByteBuffer.cs b/Source/Framework/IO/ByteBuffer.cs
index cc8fbb6c2..ba8095d51 100644
--- a/Source/Framework/IO/ByteBuffer.cs
+++ b/Source/Framework/IO/ByteBuffer.cs
@@ -347,7 +347,7 @@ namespace Framework.IO
         public void WriteBits(object bit, int count)
         {
             for (int i = count - 1; i >= 0; --i)
-                WriteBit((Convert.ToInt32(bit) >> i) & 1);
+                WriteBit((Convert.ToUInt32(bit) >> i) & 1);
         }
 
         public void WritePackedTime(long time)
diff --git a/Source/Game/Entities/Item/Item.cs b/Source/Game/Entities/Item/Item.cs
index 37ff0c4f4..17d303b4a 100644
--- a/Source/Game/Entities/Item/Item.cs
+++ b/Source/Game/Entities/Item/Item.cs
@@ -1091,7 +1091,7 @@ namespace Game.Entities
 
         public byte GetGemCountWithLimitCategory(uint limitCategory)
         {
-            var list = (List<SocketedGem>)m_itemData.Gems.GetEnumerator();
+            var list = (List<SocketedGem>)m_itemData.Gems;
             return (byte)list.Count(gemData =>
             {
                 ItemTemplate gemProto = Global.ObjectMgr.GetItemTemplate(gemData.ItemId);
diff --git a/Source/Game/Entities/Object/Update/UpdateFields.cs b/Source/Game/Entities/Object/Update/UpdateFields.cs
index c59271f12..0815e08d7 100644
--- a/Source/Game/Entities/Object/Update/UpdateFields.cs
+++ b/Source/Game/Entities/Object/Update/UpdateFields.cs
@@ -555,7 +555,7 @@ namespace Game.Entities
         public UpdateField<uint> NumSlots = new UpdateField<uint>(0, 1);
         public UpdateFieldArray<ObjectGuid> Slots = new UpdateFieldArray<ObjectGuid>(36, 2, 3);
 
-        public ContainerData() : base(0, TypeId.Item, 39) { }
+        public ContainerData() : base(0, TypeId.Container, 39) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Bag owner, Player receiver)
         {
@@ -1064,7 +1064,7 @@ namespace Game.Entities
         public UpdateFieldArray<int> PowerCostModifier = new UpdateFieldArray<int>(7, 162, 177);
         public UpdateFieldArray<float> PowerCostMultiplier = new UpdateFieldArray<float>(7, 162, 184);
 
-        public UnitData() : base(191) { }
+        public UnitData() : base(0, TypeId.Unit, 191) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Unit owner, Player receiver)
         {
@@ -2251,7 +2251,7 @@ namespace Game.Entities
         public UpdateFieldArray<VisibleItem> VisibleItems = new UpdateFieldArray<VisibleItem>(19, 136, 137);
         public UpdateFieldArray<float> AvgItemLevel = new UpdateFieldArray<float>(4, 156, 157);
 
-        public PlayerData() : base(161) { }
+        public PlayerData() : base(0, TypeId.Player, 161) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver)
         {
@@ -2959,7 +2959,7 @@ namespace Game.Entities
         public UpdateFieldArray<uint> BankBagSlotFlags = new UpdateFieldArray<uint>(7, 603, 604);
         public UpdateFieldArray<ulong> QuestCompleted = new UpdateFieldArray<ulong>(875, 611, 612);
 
-        public ActivePlayerData() : base(1487) { }
+        public ActivePlayerData() : base(0, TypeId.ActivePlayer, 1487) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver)
         {
@@ -4070,7 +4070,7 @@ namespace Game.Entities
         public UpdateField<uint> ArtKit = new UpdateField<uint>(0, 18);
         public UpdateField<uint> CustomParam = new UpdateField<uint>(0, 19);
 
-        public GameObjectFieldData() : base(20) { }
+        public GameObjectFieldData() : base(0, TypeId.GameObject, 20) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, GameObject owner, Player receiver)
         {
@@ -4276,7 +4276,7 @@ namespace Game.Entities
         public UpdateField<uint> CastTime = new UpdateField<uint>(0, 5);
         public UpdateField<byte> Type = new UpdateField<byte>(0, 6);
 
-        public DynamicObjectData() : base(7) { }
+        public DynamicObjectData() : base(0, TypeId.DynamicObject, 7) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, DynamicObject owner, Player receiver)
         {
@@ -4353,7 +4353,7 @@ namespace Game.Entities
         public UpdateFieldArray<uint> Items = new UpdateFieldArray<uint>(19, 16, 17);
         public UpdateFieldArray<byte> CustomDisplayOption = new UpdateFieldArray<byte>(3, 36, 37);
 
-        public CorpseData() : base(40) { }
+        public CorpseData() : base(0, TypeId.Corpse, 40) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Corpse owner, Player receiver)
         {
@@ -4579,7 +4579,7 @@ namespace Game.Entities
         public UpdateField<uint> DecalPropertiesID = new UpdateField<uint>(0, 12);
         public UpdateField<ObjectGuid> CreatingEffectGUID = new UpdateField<ObjectGuid>(0, 13);
 
-        public AreaTriggerFieldData() : base(14) { }
+        public AreaTriggerFieldData() : base(0, TypeId.AreaTrigger, 14) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, AreaTrigger owner, Player receiver)
         {
@@ -4793,7 +4793,7 @@ namespace Game.Entities
         public UpdateField<uint> LastLineEndTime = new UpdateField<uint>(0, 3);
         public UpdateField<uint> Field_1C = new UpdateField<uint>(0, 4);
 
-        public ConversationData() : base(5) { }
+        public ConversationData() : base(0, TypeId.Conversation, 5) { }
 
         public override void WriteCreate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Conversation owner, Player receiver)
         {
diff --git a/Source/Game/Entities/Object/Update/UpdateMask.cs b/Source/Game/Entities/Object/Update/UpdateMask.cs
index 14c2b802b..d2f4831d0 100644
--- a/Source/Game/Entities/Object/Update/UpdateMask.cs
+++ b/Source/Game/Entities/Object/Update/UpdateMask.cs
@@ -34,7 +34,6 @@ namespace Game.Entities
             _blockCount = (bits + 31) / 32;
             _blocksMaskCount = (_blockCount + 31) / 32;
 
-
             _blocks = new uint[_blockCount];
             _blocksMask = new uint[_blocksMaskCount];
 
diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs
index 643b2834b..f1aab4574 100644
--- a/Source/Game/Entities/Unit/Unit.Combat.cs
+++ b/Source/Game/Entities/Unit/Unit.Combat.cs
@@ -285,7 +285,7 @@ namespace Game.Entities
                 owner.RemoveUnitFlag(UnitFlags.PetInCombat);
         }
 
-        void RemoveAllAttackers()
+        public void RemoveAllAttackers()
         {
             while (!attackerList.Empty())
             {
@@ -2420,7 +2420,7 @@ namespace Game.Entities
 
             victimResistance = Math.Max(victimResistance, 0.0f);
             if (owner)
-                victimResistance += Math.Max((victim.GetLevelForTarget(owner) - owner.GetLevelForTarget(victim)) * 5.0f, 0.0f);
+                victimResistance += Math.Max(((float)victim.GetLevelForTarget(owner) - (float)owner.GetLevelForTarget(victim)) * 5.0f, 0.0f);
 
             uint bossLevel = 83;
             float bossResistanceConstant = 510.0f;