4 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 755ae6da4..0ca0a9bac 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -178,7 +178,7 @@ class ModuleNickLock : public Module
 		if (isdigit(newnick[0])) /* Allow a switch to a UID */
 			return MOD_RES_PASSTHRU;
 
-		if (User::NICKForced.get(user)) /* Allow forced nick changes */
+		if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */
 			return MOD_RES_PASSTHRU;
 
 		if (locked.get(user))
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index e811b8e67..22b0067cc 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -78,7 +78,7 @@ class ModuleNoNickChange : public Module
 			return MOD_RES_PASSTHRU;
 
 		// Allow forced nick changes.
-		if (User::NICKForced.get(user))
+		if (ServerInstance->NICKForced.get(user))
 			return MOD_RES_PASSTHRU;
 
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index e71e55ae8..9c0997d7c 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -743,7 +743,7 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin
 	if (!IS_LOCAL(source))
 		return; // Only start routing if we're origin.
 
-	User::OperQuit.set(dest, operreason);
+	ServerInstance->OperQuit.set(dest, operreason);
 	parameterlist params;
 	params.push_back(":"+operreason);
 	Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
diff --git a/src/modules/m_spanningtree/operquit.cpp b/src/modules/m_spanningtree/operquit.cpp
index 9128baa0f..faf150be7 100644
--- a/src/modules/m_spanningtree/operquit.cpp
+++ b/src/modules/m_spanningtree/operquit.cpp
@@ -30,7 +30,7 @@ bool TreeSocket::OperQuit(const std::string &prefix, parameterlist &params)
 
 	if (u)
 	{
-		User::OperQuit.set(u, params[0]);
+		ServerInstance->OperQuit.set(u, params[0]);
 		params[0] = ":" + params[0];
 		Utils->DoOneToAllButSender(prefix,"OPERQUIT",params,prefix);
 	}