diff --git a/exec/ircd.js b/exec/ircd.js
index 9258f030a7e837161c36f2499cb2883052786ec7..b0d70abfdeb5e9a25f4b0148030366e59d2e3cc3 100644
--- a/exec/ircd.js
+++ b/exec/ircd.js
@@ -45,7 +45,7 @@ const VERSION_STR = "Synchronet "
 // It also enables some more verbose WALLOPS, especially as they pertain to
 // blocking functions.
 // The special "DEBUG" oper command also switches this value.
-var debug = true;
+var debug = false;
 
 // Resolve connecting clients' hostnames?  If set to false, everyone will have
 // an IP address instead of a hostname in their nick!user@host identifier.
@@ -440,7 +440,7 @@ function search_nickbuf(bufnick) {
 			if (!Users[NickHistory[nb].newnick.toUpperCase()])
 				return search_nickbuf(NickHistory[nb].newnick);
 			else
-				return NickHistory[nb].newnick;
+				return Users[NickHistory[nb].newnick.toUpperCase()];
 		}
 	}
 	return 0;
diff --git a/exec/load/ircd_channel.js b/exec/load/ircd_channel.js
index ea9f5ded800c43aea05c06774378d4706745f353..5d502abe582590f737b16690d7ccf36aa8c6f82d 100644
--- a/exec/load/ircd_channel.js
+++ b/exec/load/ircd_channel.js
@@ -38,7 +38,7 @@ const CHANMODE_VOICE		=(1<<11); // v
 
 // These are used in the mode crunching section to figure out what character
 // to display in the crunched MODE line.
-function Mode (modechar,args,state,list,isnick) {
+function Mode(modechar,args,state,list,isnick) {
 	// The mode's character
 	this.modechar = modechar;
 	// Does this mode take a single argument only?
@@ -657,7 +657,7 @@ function IRCClient_part_all() {
 
 	for(thisChannel in this.channels) {
 		partingChannel=this.channels[thisChannel];
-		this.do_part(Channels[partingChannel].nam);
+		this.do_part(partingChannel.nam);
 	}
 }