diff --git a/include/protocol.h b/include/protocol.h
index 11e37d953..5305d6d74 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -280,9 +280,9 @@ public:
 	virtual void SendServer(const Server *) = 0;
 	virtual void SendSquit(Server *, const Anope::string &message);
 
-	virtual void SendNumericInternal(int numeric, const Anope::string &dest, const std::vector<Anope::string> &params);
+	virtual void SendNumericInternal(unsigned numeric, const Anope::string &dest, const std::vector<Anope::string> &params);
 	template <typename... Args>
-	void SendNumeric(int numeric, const Anope::string &dest, Args &&...args)
+	void SendNumeric(unsigned numeric, const Anope::string &dest, Args &&...args)
 	{
 		SendNumericInternal(numeric, dest, { Anope::ToString(args)... });
 	}
diff --git a/modules/chanserv/cs_set_misc.cpp b/modules/chanserv/cs_set_misc.cpp
index ad36f703a..de4667901 100644
--- a/modules/chanserv/cs_set_misc.cpp
+++ b/modules/chanserv/cs_set_misc.cpp
@@ -15,7 +15,7 @@
 static Module *me;
 
 static Anope::map<Anope::string> descriptions;
-static Anope::map<uint16_t> numerics;
+static Anope::map<unsigned> numerics;
 
 struct CSMiscData;
 static Anope::map<ExtensibleItem<CSMiscData> *> items;
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp
index b056bbbb5..b3ca55448 100644
--- a/modules/protocol/inspircd.cpp
+++ b/modules/protocol/inspircd.cpp
@@ -410,7 +410,7 @@ public:
 		SendAddLine("G", x->GetUser() + "@" + x->GetHost(), timeleft, x->by, x->GetReason());
 	}
 
-	void SendNumericInternal(int numeric, const Anope::string &dest, const std::vector<Anope::string> &params) override
+	void SendNumericInternal(unsigned numeric, const Anope::string &dest, const std::vector<Anope::string> &params) override
 	{
 		auto newparams = params;
 		newparams.insert(newparams.begin(), { Me->GetSID(), dest, Anope::ToString(numeric) });
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 5150b5572..10c8b2918 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -233,7 +233,7 @@ void IRCDProto::SendGlobops(const MessageSource &source, const Anope::string &me
 	Uplink::Send(source, "GLOBOPS", message);
 }
 
-void IRCDProto::SendNumericInternal(int numeric, const Anope::string &dest, const std::vector<Anope::string> &params)
+void IRCDProto::SendNumericInternal(unsigned numeric, const Anope::string &dest, const std::vector<Anope::string> &params)
 {
 	Anope::string n = Anope::ToString(numeric);
 	if (numeric < 10)