diff --git a/irc/commands.go b/irc/commands.go
index ff0cf5ae..c8da610c 100644
--- a/irc/commands.go
+++ b/irc/commands.go
@@ -27,7 +27,7 @@ func (cmd *Command) Run(server *Server, client *Client, msg ircmsg.IrcMessage) b
 		client.Send(nil, server.name, ERR_NOTREGISTERED, client.nick, client.t("You need to register before you can use that command"))
 		return false
 	}
-	if cmd.oper && !client.flags[modes.Operator] {
+	if cmd.oper && !client.HasMode(modes.Operator) {
 		client.Send(nil, server.name, ERR_NOPRIVILEGES, client.nick, client.t("Permission Denied - You're not an IRC operator"))
 		return false
 	}
diff --git a/irc/handlers.go b/irc/handlers.go
index 23730178..51081daa 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -477,14 +477,7 @@ func csHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respon
 
 // DEBUG <subcmd>
 func debugHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
-	param, err := Casefold(msg.Params[0])
-	if err != nil {
-		return false
-	}
-
-	if !client.HasMode(modes.Operator) {
-		return false
-	}
+	param := strings.ToUpper(msg.Params[0])
 
 	switch param {
 	case "GCSTATS":