diff --git a/client_test.go b/client_test.go
index ca7dfa9b..1285808f 100644
--- a/client_test.go
+++ b/client_test.go
@@ -61,7 +61,7 @@ func TestClientTsigAXFR(t *testing.T) {
 	c.Net = "tcp"
 
 	if a, err := c.XfrReceive(m, "85.223.71.124:53"); err != nil {
-		t.Log("Failed to setup axfr" + err.Error())
+		t.Log("Failed to setup axfr: " + err.Error())
 		t.Fail()
 		return
 	} else {
diff --git a/tsig.go b/tsig.go
index 9f35bbcd..f54c5faa 100644
--- a/tsig.go
+++ b/tsig.go
@@ -194,7 +194,7 @@ func TsigGenerate(m *Msg, secret, requestMAC string, timersOnly bool) ([]byte, s
 	t.OrigId = m.Id
 
 	tbuf := make([]byte, t.Len())
-	if off, err := PackRR(t, tbuf, 0, nil, false); err != nil {
+	if off, err := PackRR(t, tbuf, 0, nil, false); err == nil {
 		tbuf = tbuf[:off] // reset to actual size used
 	} else {
 		return nil, "", err
diff --git a/zone.go b/zone.go
index 3340904b..9b12bebb 100644
--- a/zone.go
+++ b/zone.go
@@ -109,6 +109,7 @@ func NewZoneData(s string) *ZoneData {
 // we preserve the nsec ordering of the zone (this idea was stolen from NSD).
 // Each label is also lowercased.
 func toRadixName(d string) string {
+	// FIXME(mg): make *much* faster
 	if d == "." {
 		return "."
 	}