Merge branch '2.0' into 2.1.

3 files changed, 4 insertions, 4 deletions

diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp
index 1e6f4a9bc..776080afb 100644
--- a/modules/commands/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
@@ -284,7 +284,7 @@ class NSRecover : public Module
 				if (it != ei->end())
 				{
 					for (size_t i = 0; i < it->second.Modes().length(); ++i)
-						c->SetMode(c->ci->WhoSends(), ModeManager::FindChannelModeByChar(it->second.Modes()[i]), u->GetUID());
+						c->SetMode(c->WhoSends(), ModeManager::FindChannelModeByChar(it->second.Modes()[i]), u->GetUID());
 
 					ei->erase(it);
 					if (ei->empty())
diff --git a/modules/commands/os_config.cpp b/modules/commands/os_config.cpp
index 939f1b846..f94491a5c 100644
--- a/modules/commands/os_config.cpp
+++ b/modules/commands/os_config.cpp
@@ -32,7 +32,7 @@ class CommandOSConfig : public Command
 				return;
 			}
 
-			Configuration::Block *block = Config->GetBlock(params[1]);
+			Configuration::MutableBlock *block = Config->GetMutableBlock(params[1]);
 			if (!block)
 				block = Config->GetModule(params[1]);
 
diff --git a/modules/commands/os_mode.cpp b/modules/commands/os_mode.cpp
index afbaafb1a..541aa8fbc 100644
--- a/modules/commands/os_mode.cpp
+++ b/modules/commands/os_mode.cpp
@@ -37,7 +37,7 @@ class CommandOSMode : public Command
 
 			const Channel::ModeList chmodes = c->GetModes();
 			for (Channel::ModeList::const_iterator it = chmodes.begin(), it_end = chmodes.end(); it != it_end && c; ++it)
-				c->RemoveMode(c->ci->WhoSends(), it->first, it->second, false);
+				c->RemoveMode(c->WhoSends(), it->first, it->second, false);
 
 			if (!c)
 			{
@@ -55,7 +55,7 @@ class CommandOSMode : public Command
 						continue;
 
 					for (size_t i = uc->status.Modes().length(); i > 0; --i)
-						c->RemoveMode(c->ci->WhoSends(), ModeManager::FindChannelModeByChar(uc->status.Modes()[i - 1]), uc->user->GetUID(), false);
+						c->RemoveMode(c->WhoSends(), ModeManager::FindChannelModeByChar(uc->status.Modes()[i - 1]), uc->user->GetUID(), false);
 				}
 
 				source.Reply(_("All modes cleared on %s."), c->name.c_str());