8 files changed, 12 insertions, 8 deletions
diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index cd0627178..83c921d8b 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -60,7 +60,7 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0], 'E', user))
+		if (ServerInstance->XLines->DelLine(parameters[0], "E", user))
 		{
 			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]);
 		}
diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index abe29d18e..caed54ebe 100644
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -67,7 +67,7 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0],'G',user))
+		if (ServerInstance->XLines->DelLine(parameters[0],"G",user))
 		{
 			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]);
 		}
diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp
index de225b0f0..7058de77f 100644
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -66,7 +66,7 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0],'K',user))
+		if (ServerInstance->XLines->DelLine(parameters[0],"K",user))
 		{
 			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]);
 		}
diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index aaa6698ac..06fc5dcc3 100644
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -60,7 +60,7 @@ CmdResult CommandNick::Handle (const char** parameters, int, User *user)
 	}
 	else
 	{
-		XLine* mq = ServerInstance->XLines->MatchesLine('Q',parameters[0]);
+		XLine* mq = ServerInstance->XLines->MatchesLine("Q",parameters[0]);
 		if (mq)
 		{
 			ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0], user->nick, user->ident, user->host, mq->reason);
diff --git a/src/commands/cmd_qline.cpp b/src/commands/cmd_qline.cpp
index 2922c09cf..e4da8c5ff 100644
--- a/src/commands/cmd_qline.cpp
+++ b/src/commands/cmd_qline.cpp
@@ -59,7 +59,7 @@ CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0],'Q',user))
+		if (ServerInstance->XLines->DelLine(parameters[0],"Q",user))
 		{
 			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0]);
 		}
diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 5b1ab019c..174fba8ba 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -41,7 +41,7 @@ CmdResult CommandRehash::Handle (const char** parameters, int pcnt, User *user)
 		FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 		ServerInstance->Config->Read(false,user);
 		// Get XLine to do it's thing.
-		ServerInstance->XLines->CheckELines(ServerInstance->XLines->lookup_lines['E']);
+		ServerInstance->XLines->CheckELines(ServerInstance->XLines->lookup_lines["E"]);
 		ServerInstance->XLines->ApplyLines();
 		ServerInstance->Res->Rehash();
 		ServerInstance->ResetMaxBans();
diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index 5d4417689..0e8a5a0b0 100644
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -144,6 +144,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 		case 'q':
 		case 'Z':
 		case 'e':
+		{
 			/* FIXME: Make the 216 here different depending on stats char:
 			 * k: 216
 			 * g: 223
@@ -151,7 +152,10 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 			 * z: 223
 			 * e: 223
 			 */
-			ServerInstance->XLines->InvokeStats(toupper(statschar),216,user,results);
+			std::string stat;
+			stat += toupper(statschar);
+			ServerInstance->XLines->InvokeStats(stat,216,user,results);
+		}
 		break;
 
 		/* stats m (list number of times each command has been used, plus bytecount) */
diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index e701867fb..520bea306 100644
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -67,7 +67,7 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0],'Z',user))
+		if (ServerInstance->XLines->DelLine(parameters[0],"Z",user))
 		{
 			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
 		}