diff --git a/parse_test.go b/parse_test.go
index 659a38ce..b20abb10 100644
--- a/parse_test.go
+++ b/parse_test.go
@@ -1480,7 +1480,7 @@ func TestParseCAA(t *testing.T) {
 
 func TestParseURI(t *testing.T) {
 	lt := map[string]string{
-		"_http._tcp IN URI   10 1 \"http://www.example.com/path\"": "_http._tcp\t3600\tIN\tURI\t10 1 \"http://www.example.com/path\"",
+		"_http._tcp. IN URI   10 1 \"http://www.example.com/path\"": "_http._tcp.\t3600\tIN\tURI\t10 1 \"http://www.example.com/path\"",
 	}
 	for i, o := range lt {
 		rr, err := NewRR(i)
diff --git a/types.go b/types.go
index 34d3089b..a60e423a 100644
--- a/types.go
+++ b/types.go
@@ -1337,7 +1337,7 @@ func (rr *URI) copy() RR           { return &URI{*rr.Hdr.copyHeader(), rr.Weight
 func (rr *URI) len() int           { return rr.Hdr.len() + 4 + len(rr.Target) }
 func (rr *URI) String() string {
 	return rr.Hdr.String() + strconv.Itoa(int(rr.Priority)) +
-		" " + strconv.Itoa(int(rr.Weight)) + sprintTxtOctet(rr.Target)
+		" " + strconv.Itoa(int(rr.Weight)) + " " + sprintTxtOctet(rr.Target)
 }
 
 type DHCID struct {
diff --git a/zscan_rr.go b/zscan_rr.go
index c8d73afc..dbfdba13 100644
--- a/zscan_rr.go
+++ b/zscan_rr.go
@@ -1890,9 +1890,9 @@ func setURI(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 	rr.Weight = uint16(i)
 
 	<-c // zBlank
-	s, e, c1 := endingToTxtSlice(c, "bad URI Target", f)
-	if e != nil {
-		return nil, e.(*ParseError), ""
+	s, err, c1 := endingToTxtSlice(c, "bad URI Target", f)
+	if err != nil {
+		return nil, err, ""
 	}
 	rr.Target = s[0]
 	return rr, nil, c1
@@ -2180,7 +2180,7 @@ func setCAA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 	}
 	rr.Flag = uint8(i)
 
-	<-c // zBlank
+	<-c     // zBlank
 	l = <-c // zString
 	if l.value != zString {
 		return nil, &ParseError{f, "bad CAA Tag", l}, ""