diff --git a/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h b/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h
index e73b56b3..03d9d7f3 100755
--- a/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h
+++ b/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h
@@ -216,6 +216,20 @@ namespace Archive
 		internal_unpack(source, buffer, "%i %u:");
 	}
 
+        template<>
+        inline void AutoDeltaPackedMap<int, unsigned int>::pack(ByteStream & target, const std::string & buffer)
+        {
+	        internal_pack(target, buffer, "%i %u");
+	}
+
+	template<>
+	inline void AutoDeltaPackedMap<int, unsigned int>::unpack(ReadIterator & source, std::string & buffer)
+	{
+		internal_unpack(source, buffer, "%i %u:");
+	}
+
+
+
 #ifdef WIN32
 	template<>
 	inline void AutoDeltaPackedMap<unsigned long, unsigned __int64>::pack(ByteStream & target, const std::string & buffer)
diff --git a/game/server/application/SwgDatabaseServer/src/shared/generated/Decoder_cpp.template b/game/server/application/SwgDatabaseServer/src/shared/generated/Decoder_cpp.template
index 4c1e0e2d..9598338b 100644
--- a/game/server/application/SwgDatabaseServer/src/shared/generated/Decoder_cpp.template
+++ b/game/server/application/SwgDatabaseServer/src/shared/generated/Decoder_cpp.template
@@ -1240,7 +1240,7 @@ void SwgSnapshot::decodeSharedMissionObject(NetworkId const & objectId, uint16 i
 		}
 		case 10:
 		{
-			uint32 temp;
+			unsigned int temp;
 			Archive::get(data,temp);
 			row->target_appearance=temp;
 			break;
@@ -1264,7 +1264,7 @@ void SwgSnapshot::decodeSharedMissionObject(NetworkId const & objectId, uint16 i
 		}
 		case 14:
 		{
-			uint32 temp;
+			unsigned int temp;
 			Archive::get(data,temp);
 			row->mission_type=temp;
 			break;
@@ -2211,7 +2211,7 @@ void SwgSnapshot::decodeSharedShipObject(NetworkId const & objectId, uint16 inde
 		}
 		case 16:
 		{
-			uint32 temp;
+			unsigned int temp;
 			Archive::get(data,temp);
 			row->chassis_type=temp;
 			break;
@@ -2290,7 +2290,7 @@ void SwgSnapshot::decodeServerShipObject(NetworkId const & objectId, uint16 inde
 		case 16:
 		{
 			std::string packedValue;
-			Archive::AutoDeltaPackedMap<int,uint32>::unpack(data,packedValue);
+			Archive::AutoDeltaPackedMap::unpack(data,packedValue);
 			row->cmp_crc=packedValue;
 			break;
 		}
@@ -2417,7 +2417,7 @@ void SwgSnapshot::decodeClientShipObject(NetworkId const & objectId, uint16 inde
 		case 16:
 		{
 			std::string packedValue;
-			Archive::AutoDeltaPackedMap<int,uint32>::unpack(data,packedValue);
+			Archive::AutoDeltaPackedMap::unpack(data,packedValue);
 			row->weapon_ammo_type=packedValue;
 			break;
 		}
@@ -2679,7 +2679,7 @@ void SwgSnapshot::decodeSharedTangibleObject(NetworkId const & objectId, uint16
 		{
 		case 4:
 		{
-			uint32 temp;
+			unsigned int temp;
 			Archive::get(data,temp);
 			row->pvp_faction=temp;
 			break;
@@ -2788,7 +2788,7 @@ void SwgSnapshot::decodeServerTangibleObject(NetworkId const & objectId, uint16
 		}
 		case 15:
 		{
-			uint32 temp;
+			unsigned int temp;
 			Archive::get(data,temp);
 			row->source_draft_schematic=temp;
 			break;
@@ -3160,7 +3160,7 @@ void SwgSnapshot::decodeParentClientPlayerObject(NetworkId const & objectId, uin
 		}
 		case 6:
 		{
-			uint32 temp;
+			unsigned int temp;
 			Archive::get(data,temp);
 			row->current_quest=temp;
 			break;
diff --git a/game/server/application/SwgDatabaseServer/src/shared/generated/Encoder_cpp.template b/game/server/application/SwgDatabaseServer/src/shared/generated/Encoder_cpp.template
index 1dba75a4..8d2918fc 100644
--- a/game/server/application/SwgDatabaseServer/src/shared/generated/Encoder_cpp.template
+++ b/game/server/application/SwgDatabaseServer/src/shared/generated/Encoder_cpp.template
@@ -971,7 +971,7 @@ bool SwgSnapshot::encodeSharedMissionObject(NetworkId const & objectId, Archive:
 	}
 		encodeLocation(data,row->start_x,row->start_y,row->start_z,row->start_cell,row->start_scene);
 	{
-		uint32 temp;
+		unsigned int temp;
 		row->target_appearance.getValue(temp);
 		Archive::put(data,temp);
 	}
@@ -983,7 +983,7 @@ bool SwgSnapshot::encodeSharedMissionObject(NetworkId const & objectId, Archive:
 		Archive::put(data,temp);
 	}
 	{
-		uint32 temp;
+		unsigned int temp;
 		row->mission_type.getValue(temp);
 		Archive::put(data,temp);
 	}
@@ -1707,7 +1707,7 @@ bool SwgSnapshot::encodeSharedShipObject(NetworkId const & objectId, Archive::By
 		Archive::put(data,temp);
 	}
 	{
-		uint32 temp;
+		unsigned int temp;
 		row->chassis_type.getValue(temp);
 		Archive::put(data,temp);
 	}
@@ -1768,7 +1768,7 @@ bool SwgSnapshot::encodeServerShipObject(NetworkId const & objectId, Archive::By
 	{
 		std::string packedValue;
 		row->cmp_crc.getValue(packedValue);
-		Archive::AutoDeltaPackedMap<int,uint32>::pack(data, packedValue);
+		Archive::AutoDeltaPackedMap::pack(data, packedValue);
 	}
 	return true;
 }
@@ -1862,7 +1862,7 @@ bool SwgSnapshot::encodeClientShipObject(NetworkId const & objectId, Archive::By
 	{
 		std::string packedValue;
 		row->weapon_ammo_type.getValue(packedValue);
-		Archive::AutoDeltaPackedMap<int,uint32>::pack(data, packedValue);
+		Archive::AutoDeltaPackedMap::pack(data, packedValue);
 	}
 	{
 		float temp;
@@ -2061,7 +2061,7 @@ bool SwgSnapshot::encodeSharedTangibleObject(NetworkId const & objectId, Archive
 		return false;
 
 	{
-		uint32 temp;
+		unsigned int temp;
 		row->pvp_faction.getValue(temp);
 		Archive::put(data,temp);
 	}
@@ -2137,7 +2137,7 @@ bool SwgSnapshot::encodeServerTangibleObject(NetworkId const & objectId, Archive
 		Archive::put(data,temp);
 	}
 	{
-		uint32 temp;
+		unsigned int temp;
 		row->source_draft_schematic.getValue(temp);
 		Archive::put(data,temp);
 	}
@@ -2436,7 +2436,7 @@ bool SwgSnapshot::encodeParentClientPlayerObject(NetworkId const & objectId, Arc
 		Archive::put(data,temp);
 	}
 	{
-		uint32 temp;
+		unsigned int temp;
 		row->current_quest.getValue(temp);
 		Archive::put(data,temp);
 	}