diff --git a/common/light_source.cpp b/common/light_source.cpp
index 939676ee0..476f315b8 100644
--- a/common/light_source.cpp
+++ b/common/light_source.cpp
@@ -89,7 +89,7 @@ EQEmu::LightSource_Struct::LightSource_Struct()
 
 void EQEmu::LightSource_Struct::Clear()
 {
-	memset(&Slot, 0, (sizeof(uint8) * sizeof(Slot)));
+	memset(&Slot, 0, (sizeof(uint8) * lightsource::LightCount));
 }
 
 void EQEmu::LightSourceProfile::Clear()
diff --git a/common/patches/rof2_limits.h b/common/patches/rof2_limits.h
index 2320c1393..605073ad7 100644
--- a/common/patches/rof2_limits.h
+++ b/common/patches/rof2_limits.h
@@ -228,8 +228,6 @@ namespace RoF2
 		const size_t InvTypeKronoSize = 0;//unknown
 		const size_t InvTypeOtherSize = 0;//unknown
 
-		const size_t NPCTradeSize = 4;
-
 		extern size_t GetInvTypeSize(int inv_type);
 		extern const char* GetInvTypeName(int inv_type);
 
@@ -261,6 +259,7 @@ namespace RoF2
 
 	namespace profile {
 		const size_t TributeSize = invtype::InvTypeTributeSize;
+		const size_t GuildTributeSize = invtype::InvTypeGuildTributeSize;
 
 		const size_t BandoliersSize = 20;		// number of bandolier instances
 		const size_t BandolierItemCount = 4;	// number of equipment slots in bandolier instance
diff --git a/common/patches/rof_limits.h b/common/patches/rof_limits.h
index 94e55a47a..765d61c00 100644
--- a/common/patches/rof_limits.h
+++ b/common/patches/rof_limits.h
@@ -219,8 +219,6 @@ namespace RoF
 		const size_t InvTypeGuildTrophyTributeSize = 0;//unknown
 		const size_t InvTypeOtherSize = 0;//unknown
 
-		const size_t NPCTradeSize = 4;
-
 		extern size_t GetInvTypeSize(int inv_type);
 		extern const char* GetInvTypeName(int inv_type);
 
@@ -252,6 +250,7 @@ namespace RoF
 
 	namespace profile {
 		const size_t TributeSize = invtype::InvTypeTributeSize;
+		const size_t GuildTributeSize = invtype::InvTypeGuildTributeSize;
 
 		const size_t BandoliersSize = 20;		// number of bandolier instances
 		const size_t BandolierItemCount = 4;	// number of equipment slots in bandolier instance
diff --git a/common/patches/sod_limits.h b/common/patches/sod_limits.h
index 48d56cfab..430ae5b21 100644
--- a/common/patches/sod_limits.h
+++ b/common/patches/sod_limits.h
@@ -203,8 +203,6 @@ namespace SoD
 		const size_t InvTypeArchivedSize = 0;//unknown
 		const size_t InvTypeOtherSize = 0;//unknown
 
-		const size_t NPCTradeSize = 4;
-
 		extern size_t GetInvTypeSize(int inv_type);
 		extern const char* GetInvTypeName(int inv_type);
 
@@ -279,6 +277,7 @@ namespace SoD
 
 	namespace profile {
 		const size_t TributeSize = invtype::InvTypeTributeSize;
+		const size_t GuildTributeSize = invtype::InvTypeGuildTributeSize;
 
 		const size_t BandoliersSize = 20;		// number of bandolier instances
 		const size_t BandolierItemCount = 4;	// number of equipment slots in bandolier instance
diff --git a/common/patches/sof_limits.h b/common/patches/sof_limits.h
index 42033b2f6..0317fd72a 100644
--- a/common/patches/sof_limits.h
+++ b/common/patches/sof_limits.h
@@ -203,8 +203,6 @@ namespace SoF
 		const size_t InvTypeArchivedSize = 0;//unknown
 		const size_t InvTypeOtherSize = 0;//unknown
 
-		const size_t NPCTradeSize = 4;
-
 		extern size_t GetInvTypeSize(int inv_type);
 		extern const char* GetInvTypeName(int inv_type);
 
@@ -279,6 +277,7 @@ namespace SoF
 
 	namespace profile {
 		const size_t TributeSize = invtype::InvTypeTributeSize;
+		const size_t GuildTributeSize = invtype::InvTypeGuildTributeSize;
 
 		const size_t BandoliersSize = 20;		// number of bandolier instances
 		const size_t BandolierItemCount = 4;	// number of equipment slots in bandolier instance
diff --git a/common/patches/titanium_limits.h b/common/patches/titanium_limits.h
index 51651ea38..643b75be7 100644
--- a/common/patches/titanium_limits.h
+++ b/common/patches/titanium_limits.h
@@ -202,8 +202,6 @@ namespace Titanium
 		const size_t InvTypeArchivedSize = 0;//unknown
 		const size_t InvTypeOtherSize = 0;//unknown
 
-		const size_t NPCTradeSize = 4;
-
 		extern size_t GetInvTypeSize(int inv_type);
 		extern const char* GetInvTypeName(int inv_type);
 
@@ -278,6 +276,7 @@ namespace Titanium
 
 	namespace profile {
 		const size_t TributeSize = invtype::InvTypeTributeSize;
+		const size_t GuildTributeSize = invtype::InvTypeGuildTributeSize;
 
 		const size_t BandoliersSize = 4;		// number of bandolier instances
 		const size_t BandolierItemCount = 4;	// number of equipment slots in bandolier instance
diff --git a/common/patches/uf_limits.h b/common/patches/uf_limits.h
index b71937fa6..e199899dd 100644
--- a/common/patches/uf_limits.h
+++ b/common/patches/uf_limits.h
@@ -204,8 +204,6 @@ namespace UF
 		const size_t InvTypeArchivedSize = 0;//unknown
 		const size_t InvTypeOtherSize = 0;//unknown
 
-		const size_t NPCTradeSize = 4;
-
 		extern size_t GetInvTypeSize(int inv_type);
 		extern const char* GetInvTypeName(int inv_type);
 	
@@ -280,6 +278,7 @@ namespace UF
 
 	namespace profile {
 		const size_t TributeSize = invtype::InvTypeTributeSize;
+		const size_t GuildTributeSize = invtype::InvTypeGuildTributeSize;
 
 		const size_t BandoliersSize = 20;		// number of bandolier instances
 		const size_t BandolierItemCount = 4;	// number of equipment slots in bandolier instance