4 files changed, 6 insertions, 6 deletions
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 8db699b19..47913bdc0 100644
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -15,7 +15,7 @@
 #include "modes/cmode_b.h"
 
 extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern int MODCOUNT;
@@ -105,7 +105,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 	}
 	else
 	{
-		strlcpy(b.set_by,Config->ServerName,NICKMAX-1);
+		strlcpy(b.set_by,ServerInstance->Config->ServerName,NICKMAX-1);
 	}
 	chan->bans.push_back(b);
 	return dest;
diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index 7f32ad344..5137bfd4a 100644
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -16,7 +16,7 @@
 #include "modes/cmode_h.h"
 
 extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern int MODCOUNT;
@@ -48,7 +48,7 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr
 	/* If halfops are not enabled in the conf, we don't execute
 	 * anything in this class at all.
 	 */
-	if (!Config->AllowHalfop)
+	if (!ServerInstance->Config->AllowHalfop)
 	{
 		parameter = "";
 		return MODEACTION_DENY;
diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 22d95d5a9..e8c3cbed7 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -16,7 +16,7 @@
 #include "modes/cmode_o.h"
 
 extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern int MODCOUNT;
diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 69f64d2da..ddac844ec 100644
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -16,7 +16,7 @@
 #include "modes/cmode_v.h"
 
 extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern int MODCOUNT;