2 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/m_spanningtree/commandbuilder.h b/src/modules/m_spanningtree/commandbuilder.h
index 07f7c94d0..597b22751 100644
--- a/src/modules/m_spanningtree/commandbuilder.h
+++ b/src/modules/m_spanningtree/commandbuilder.h
@@ -49,15 +49,15 @@ class CmdBuilder
 		push(cmd);
 	}
 
-	CmdBuilder& push_raw(const std::string& str)
+	CmdBuilder& push_raw(const std::string& s)
 	{
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
-	CmdBuilder& push_raw(const char* str)
+	CmdBuilder& push_raw(const char* s)
 	{
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
@@ -67,17 +67,17 @@ class CmdBuilder
 		return *this;
 	}
 
-	CmdBuilder& push(const std::string& str)
+	CmdBuilder& push(const std::string& s)
 	{
 		content.push_back(' ');
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
-	CmdBuilder& push(const char* str)
+	CmdBuilder& push(const char* s)
 	{
 		content.push_back(' ');
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
@@ -96,11 +96,11 @@ class CmdBuilder
 		return *this;
 	}
 
-	CmdBuilder& push_last(const std::string& str)
+	CmdBuilder& push_last(const std::string& s)
 	{
 		content.push_back(' ');
 		content.push_back(':');
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
@@ -112,7 +112,7 @@ class CmdBuilder
 		return *this;
 	}
 
-	void push_back(const std::string& str) { push(str); }
+	void push_back(const std::string& s) { push(s); }
 
 	const std::string& str() const { return content; }
 	operator const std::string&() const { return str(); }
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 8d14ff5ff..e3f355ac6 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -307,7 +307,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 
 	ServerCommand* scmd = Utils->Creator->CmdManager.GetHandler(command);
 	CommandBase* cmdbase = scmd;
-	Command* cmd;
+	Command* cmd = NULL;
 	if (!scmd)
 	{
 		// Not a special server-to-server command