diff --git a/irc/commands.go b/irc/commands.go
index b882d436..e082e53e 100644
--- a/irc/commands.go
+++ b/irc/commands.go
@@ -643,7 +643,7 @@ func NewWhoCommand(args []string) (editableCommand, error) {
 }
 
 func (msg *WhoCommand) String() string {
-	return fmt.Sprintf("WHO(mask=%s, operatorOnly=%s)", msg.mask, msg.operatorOnly)
+	return fmt.Sprintf("WHO(mask=%s, operatorOnly=%t)", msg.mask, msg.operatorOnly)
 }
 
 type OperCommand struct {
diff --git a/irc/reply.go b/irc/reply.go
index aaa466d6..47922443 100644
--- a/irc/reply.go
+++ b/irc/reply.go
@@ -98,7 +98,7 @@ func RplTopicMsg(source Identifier, channel *Channel) string {
 }
 
 func RplPing(server *Server, target Identifier) string {
-	return NewStringReply(server, PING, target.Nick())
+	return NewStringReply(server, PING, ":%s", target.Nick())
 }
 
 func RplPong(server *Server, client *Client) string {