diff --git a/zone/client.cpp b/zone/client.cpp
index e37f986398..3fc130b218 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -12832,15 +12832,15 @@ void Client::ClientToNpcAggroProcess()
 
 bool Client::CheckHandin(
 	NPC *n,
-	std::map<std::string, uint32> handin,
-	std::map<std::string, uint32> required,
+	std::map<std::string, uint16> handin,
+	std::map<std::string, uint16> required,
 	std::vector<const EQ::ItemInstance *> items
 )
 {
 	auto h = Handin{};
 	auto r = Handin{};
 
-	std::vector<std::pair<const std::map<std::string, uint32>&, Handin&>> datasets = {};
+	std::vector<std::pair<const std::map<std::string, uint16>&, Handin&>> datasets = {};
 
 	// if we've already started the hand-in process, we don't want to re-process the hand-in data
 	// we continue to use the originally set hand-in bucket and decrement from it with each successive hand-in
diff --git a/zone/client.h b/zone/client.h
index c62a385d0f..ea751a3a5b 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -1734,8 +1734,8 @@ class Client : public Mob
 
 	bool CheckHandin(
 		NPC* n,
-		std::map<std::string, uint32> handin,
-		std::map<std::string, uint32> required,
+		std::map<std::string, uint16> handin,
+		std::map<std::string, uint16> required,
 		std::vector<const EQ::ItemInstance*> items
 	);
 	void ReturnHandinItems();
diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp
index 228645f1b8..a0fe3083ea 100644
--- a/zone/lua_client.cpp
+++ b/zone/lua_client.cpp
@@ -3453,8 +3453,8 @@ bool Lua_Client::LuaCheckHandin(
 		return false;
 	}
 
-	std::map<std::string, uint32>             handin_map;
-	std::map<std::string, uint32>             required_map;
+	std::map<std::string, uint16>             handin_map;
+	std::map<std::string, uint16>             required_map;
 	std::vector<const EQ::ItemInstance*> items;
 
 	for (luabind::iterator i(handin_table), end; i != end; i++) {
diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp
index 74fe2dd307..5f655bc116 100644
--- a/zone/perl_client.cpp
+++ b/zone/perl_client.cpp
@@ -3223,8 +3223,8 @@ bool Perl_Client_CheckHandin(
 	perl::hash handin   = handin_ref;
 	perl::hash required = required_ref;
 
-	std::map<std::string, uint32>        handin_map;
-	std::map<std::string, uint32>        required_map;
+	std::map<std::string, uint16>        handin_map;
+	std::map<std::string, uint16>        required_map;
 	std::vector<const EQ::ItemInstance*> items;
 
 	for (auto e: handin) {
diff --git a/zone/trading.cpp b/zone/trading.cpp
index 1de3b9785b..3e7bb95c40 100644
--- a/zone/trading.cpp
+++ b/zone/trading.cpp
@@ -875,7 +875,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 		if (!m_has_processed_handin_return) {
 			if (!m_handin_started) {
 				LogTradingDetail("EVENT_TRADE did not process handin, calling ReturnHandinItems() for NPC [{}]", tradingWith->GetNPCTypeID());
-				std::map<std::string, uint32> handin = {
+				std::map<std::string, uint16> handin = {
 					{"copper",   trade->cp},
 					{"silver",   trade->sp},
 					{"gold",     trade->gp},