5 files changed, 10 insertions, 8 deletions
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index ee8c82c8b..8866e8d6d 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -36,9 +36,9 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
 {
 	ServerInstance->Modules->UseInterface("BufferedSocketHook");
 	Utils = new SpanningTreeUtilities(ServerInstance, this);
-	command_rconnect = new CommandRConnect(ServerInstance, this, Utils);
+	command_rconnect = new CommandRConnect(this, Utils);
 	ServerInstance->AddCommand(command_rconnect);
-	command_rsquit = new CommandRSQuit(ServerInstance, this, Utils);
+	command_rsquit = new CommandRSQuit(this, Utils);
 	ServerInstance->AddCommand(command_rsquit);
 	RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils);
 	ServerInstance->Timers->AddTimer(RefreshTimer);
diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index 1811d73a1..a62ef5cf3 100644
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -26,9 +26,10 @@
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h */
 
-CommandRConnect::CommandRConnect (InspIRCd* Instance, Module* Creator, SpanningTreeUtilities* Util)
-	: Command(Instance, Creator, "RCONNECT", "o", 2), Utils(Util)
+CommandRConnect::CommandRConnect (Module* Creator, SpanningTreeUtilities* Util)
+	: Command(Creator, "RCONNECT", 2), Utils(Util)
 {
+	flags_needed = 'o';
 	syntax = "<remote-server-mask> <target-server-mask>";
 }
 
diff --git a/src/modules/m_spanningtree/rconnect.h b/src/modules/m_spanningtree/rconnect.h
index f038f5c22..dc62d231d 100644
--- a/src/modules/m_spanningtree/rconnect.h
+++ b/src/modules/m_spanningtree/rconnect.h
@@ -20,7 +20,7 @@ class CommandRConnect : public Command
 {
         SpanningTreeUtilities* Utils;	/* Utility class */
  public:
-        CommandRConnect (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util);
+        CommandRConnect (Module* Callback, SpanningTreeUtilities* Util);
         CmdResult Handle (const std::vector<std::string>& parameters, User *user);
 };
 
diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 7de539905..25b3c54d1 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -24,9 +24,10 @@
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h m_spanningtree/rsquit.h */
 
-CommandRSQuit::CommandRSQuit (InspIRCd* Instance, Module* Creator, SpanningTreeUtilities* Util)
-	: Command(Instance, Creator, "RSQUIT", "o", 1), Utils(Util)
+CommandRSQuit::CommandRSQuit (Module* Creator, SpanningTreeUtilities* Util)
+	: Command(Creator, "RSQUIT", 1), Utils(Util)
 {
+	flags_needed = 'o';
 	syntax = "<target-server-mask> [reason]";
 }
 
diff --git a/src/modules/m_spanningtree/rsquit.h b/src/modules/m_spanningtree/rsquit.h
index 92f6eb159..48abd5c5c 100644
--- a/src/modules/m_spanningtree/rsquit.h
+++ b/src/modules/m_spanningtree/rsquit.h
@@ -20,7 +20,7 @@ class CommandRSQuit : public Command
 {
         SpanningTreeUtilities* Utils;	/* Utility class */
  public:
-        CommandRSQuit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util);
+        CommandRSQuit (Module* Callback, SpanningTreeUtilities* Util);
         CmdResult Handle (const std::vector<std::string>& parameters, User *user);
         void NoticeUser(User* user, const std::string &msg);
 };