diff --git a/consul/coordinate_endpoint.go b/consul/coordinate_endpoint.go
index 5fc9c5f36e..9e0df58212 100644
--- a/consul/coordinate_endpoint.go
+++ b/consul/coordinate_endpoint.go
@@ -76,7 +76,7 @@ func (c *Coordinate) batchApplyUpdates() error {
 			break
 		}
 
-		updates[i] = &structs.Coordinate{node, coord}
+		updates[i] = &structs.Coordinate{Node: node, Coord: coord}
 		i++
 	}
 
diff --git a/consul/prepared_query_endpoint.go b/consul/prepared_query_endpoint.go
index f331460954..6a370f35b4 100644
--- a/consul/prepared_query_endpoint.go
+++ b/consul/prepared_query_endpoint.go
@@ -219,8 +219,6 @@ func (p *PreparedQuery) Get(args *structs.PreparedQuerySpecificRequest,
 			reply.Queries = structs.PreparedQueries{query}
 			return nil
 		})
-
-	return nil
 }
 
 // List returns all the prepared queries.
diff --git a/consul/rtt.go b/consul/rtt.go
index 11aa32917f..1d9533ab89 100644
--- a/consul/rtt.go
+++ b/consul/rtt.go
@@ -371,7 +371,7 @@ func getDatacenterMaps(s serfer, dcs []string) []structs.DatacenterMap {
 		nodes := s.GetNodesForDatacenter(dc)
 		for _, node := range nodes {
 			if coord, ok := s.GetCachedCoordinate(node); ok {
-				entry := &structs.Coordinate{node, coord}
+				entry := &structs.Coordinate{Node: node, Coord: coord}
 				m.Coordinates = append(m.Coordinates, entry)
 			}
 		}