diff --git a/cmd/radioctl/radioctl.go b/cmd/radioctl/radioctl.go
index 73d3835e41fd50e15c811e48f916cb2c0c438311..a40999d01614ecfc4dd67fc7e77f5cdb78261bb9 100644
--- a/cmd/radioctl/radioctl.go
+++ b/cmd/radioctl/radioctl.go
@@ -314,7 +314,7 @@ func init() {
 func usage() {
 	fmt.Fprintf(os.Stderr, "Usage: %s\n\nGlobal options:\n", cmdr.UsageLine)
 	flag.PrintDefaults()
-	fmt.Fprintln(os.Stderr, "\nType \"radioctl help\" for more documentation.\n")
+	fmt.Fprintf(os.Stderr, "\nType \"radioctl help\" for more documentation.\n\n")
 }
 
 func main() {
diff --git a/fe/loadbalancing.go b/fe/loadbalancing.go
index a6676947de4153610c899f9dc6e05c87cb74dfcb..fdbd10a11fcfcdc85e834524aa4b793d9fe0707b 100644
--- a/fe/loadbalancing.go
+++ b/fe/loadbalancing.go
@@ -39,7 +39,7 @@ func (wlp weightedListenersPolicy) GetNode(nodes []*autoradio.NodeStatus) *autor
 	weightBase := 1000000
 	for _, n := range nodes {
 		w := weightBase / (n.NumListeners() + 1)
-		choices = append(choices, randutil.Choice{w, n})
+		choices = append(choices, randutil.Choice{Weight: w, Item: n})
 	}
 	result, err := randutil.WeightedChoice(choices)
 	if err != nil {
diff --git a/instrumentation/stats.go b/instrumentation/stats.go
index 333d0b6cb86567e81f99b8731d9254fb41a1ece5..6ed23abf66f0ac4dcbc5012f0bed0fc55cb21db3 100644
--- a/instrumentation/stats.go
+++ b/instrumentation/stats.go
@@ -24,7 +24,7 @@ var (
 func init() {
 	hostname, err := os.Hostname()
 	if err != nil {
-		log.Fatal("Could not determine hostname: %v", err)
+		log.Fatalf("Could not determine hostname: %v", err)
 	}
 	prefix = fmt.Sprintf("autoradio.%s.", hostname)
 }
@@ -33,7 +33,7 @@ func getClient() *statsd.Client {
 	clientInit.Do(func() {
 		c, err := statsd.New(*statsdServer, prefix)
 		if err != nil {
-			log.Fatal("Error initializing instrumentation: %v", err)
+			log.Fatalf("Error initializing instrumentation: %v", err)
 		}
 		client = c
 	})
diff --git a/node/icecast_config.go b/node/icecast_config.go
index c9174b9e4aa20a57d609996bf60daf907bf65517..a63e748f7271c3712038cba2cf30003e599f96a6 100644
--- a/node/icecast_config.go
+++ b/node/icecast_config.go
@@ -151,7 +151,7 @@ func newIcecastConfig(publicIp string) *icecastConfig {
 	adminPw := getIcecastAdminPassword()
 
 	return &icecastConfig{
-		XMLName: xml.Name{"", "icecast"},
+		XMLName: xml.Name{Local: "icecast"},
 		Limits: iceLimitsConfig{
 			Clients:       maxClients,
 			Sources:       maxClients / 2,