4 files changed, 6 insertions, 1 deletions
diff --git a/src/coremods/core_channel/cmode_k.cpp b/src/coremods/core_channel/cmode_k.cpp
index 992fbc1b5..4fc29e04c 100644
--- a/src/coremods/core_channel/cmode_k.cpp
+++ b/src/coremods/core_channel/cmode_k.cpp
@@ -23,6 +23,8 @@
 #include "inspircd.h"
 #include "core_channel.h"
 
+const std::string::size_type ModeChannelKey::maxkeylen = 32;
+
 ModeChannelKey::ModeChannelKey(Module* Creator)
 	: ParamMode<ModeChannelKey, LocalStringExt>(Creator, "key", 'k', PARAM_ALWAYS)
 {
diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp
index 161f618d1..20e93ec07 100644
--- a/src/coremods/core_channel/core_channel.cpp
+++ b/src/coremods/core_channel/core_channel.cpp
@@ -114,6 +114,8 @@ class CoreModChannel : public Module, public CheckExemption::EventListener
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["KEYLEN"] = ConvToStr(ModeChannelKey::maxkeylen);
+
 		// Build a map of limits to their mode character.
 		insp::flat_map<int, std::string> limits;
 		const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h
index c500add07..3a74bc661 100644
--- a/src/coremods/core_channel/core_channel.h
+++ b/src/coremods/core_channel/core_channel.h
@@ -155,8 +155,8 @@ class ModeChannelBan : public ListModeBase
  */
 class ModeChannelKey : public ParamMode<ModeChannelKey, LocalStringExt>
 {
-	static const std::string::size_type maxkeylen = 32;
  public:
+	static const std::string::size_type maxkeylen;
 	ModeChannelKey(Module* Creator);
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE;
 	void SerializeParam(Channel* chan, const std::string* key, std::string& out)	;
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 349c48c29..d69f5606f 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -371,6 +371,7 @@ public:
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["ACCEPT"] = ConvToStr(cmd.maxaccepts);
 		tokens["CALLERID"] = ConvToStr(myumode.GetModeChar());
 	}