diff --git a/grumble.go b/grumble.go
index cee433e..c292bf8 100644
--- a/grumble.go
+++ b/grumble.go
@@ -55,11 +55,11 @@ func main() {
 	blobDir := filepath.Join(Args.DataDir, "blob")
 	err = os.Mkdir(blobDir, 0700)
 	if err != nil && !os.IsExist(err) {
-		log.Fatal("Unable to create blob directory: %v", err.Error())
+		log.Fatalf("Unable to create blob directory: %v", err)
 	}
 	err = blobstore.Open(blobDir)
 	if err != nil {
-		log.Fatalf("Unable to initialize blobstore: %v", err.Error())
+		log.Fatalf("Unable to initialize blobstore: %v", err)
 	}
 
 	// Check whether we should regenerate the default global keypair
@@ -152,7 +152,7 @@ func main() {
 	serversDirPath := filepath.Join(Args.DataDir, "servers")
 	err = os.Mkdir(serversDirPath, 0700)
 	if err != nil && !os.IsExist(err) {
-		log.Fatal("Unable to create servers directory: %v", err.Error())
+		log.Fatalf("Unable to create servers directory: %v", err)
 	}
 
 	// Read all entries of the servers directory.
@@ -163,7 +163,7 @@ func main() {
 	}
 	names, err := serversDir.Readdirnames(-1)
 	if err != nil {
-		log.Fatal("Unable to read file from data directory: %v", err.Error())
+		log.Fatalf("Unable to read file from data directory: %v", err.Error())
 	}
 	// The data dir file descriptor.
 	err = serversDir.Close()
diff --git a/server.go b/server.go
index b700e4d..8e89b51 100644
--- a/server.go
+++ b/server.go
@@ -378,7 +378,7 @@ func (server *Server) handlerLoop() {
 					if client != vb.client {
 						err := client.SendUDP(vb.buf)
 						if err != nil {
-							client.Panic("Unable to send UDP: %v", err.Error())
+							client.Panicf("Unable to send UDP: %v", err)
 						}
 					}
 				}
@@ -563,7 +563,7 @@ func (server *Server) finishAuthenticate(client *Client) {
 	// Warn clients without CELT support that they might not be able to talk to everyone else.
 	if len(client.codecs) == 0 {
 		client.codecs = []int32{CeltCompatBitstream}
-		server.Printf("Client %i connected without CELT codecs. Faking compat bitstream.", client.Session)
+		server.Printf("Client %v connected without CELT codecs. Faking compat bitstream.", client.Session)
 		if server.Opus && !client.opus {
 			client.sendMessage(&mumbleproto.TextMessage{
 				Session: []uint32{client.Session},
@@ -1373,7 +1373,7 @@ func (server *Server) Start() (err error) {
 	port := server.Port()
 
 	// Setup our UDP listener
-	server.udpconn, err = net.ListenUDP("udp", &net.UDPAddr{net.ParseIP(host), port})
+	server.udpconn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.ParseIP(host), Port: port})
 	if err != nil {
 		return err
 	}
@@ -1385,7 +1385,7 @@ func (server *Server) Start() (err error) {
 	*/
 
 	// Set up our TCP connection
-	server.tcpl, err = net.ListenTCP("tcp", &net.TCPAddr{net.ParseIP(host), port})
+	server.tcpl, err = net.ListenTCP("tcp", &net.TCPAddr{IP: net.ParseIP(host), Port: port})
 	if err != nil {
 		return err
 	}