diff --git a/client/grpc/codec.go b/client/grpc/codec.go
index 2f32a0b1..44f16d54 100644
--- a/client/grpc/codec.go
+++ b/client/grpc/codec.go
@@ -172,7 +172,7 @@ func (g *grpcCodec) Write(m *codec.Message, v interface{}) error {
 		return g.s.SendMsg(v)
 	}
 	// write the body using the framing codec
-	return g.s.SendMsg(&bytes.Frame{m.Body})
+	return g.s.SendMsg(&bytes.Frame{Data: m.Body})
 }
 
 func (g *grpcCodec) Close() error {
diff --git a/codec/jsonrpc/jsonrpc.go b/codec/jsonrpc/jsonrpc.go
index f98b2842..d7e0e1c9 100644
--- a/codec/jsonrpc/jsonrpc.go
+++ b/codec/jsonrpc/jsonrpc.go
@@ -60,7 +60,6 @@ func (j *jsonCodec) ReadHeader(m *codec.Message, mt codec.MessageType) error {
 	default:
 		return fmt.Errorf("Unrecognised message type: %v", mt)
 	}
-	return nil
 }
 
 func (j *jsonCodec) ReadBody(b interface{}) error {
diff --git a/monitor/default.go b/monitor/default.go
index 557ca234..b37b5658 100644
--- a/monitor/default.go
+++ b/monitor/default.go
@@ -307,8 +307,6 @@ func (m *monitor) Stop() error {
 		m.running = false
 		return nil
 	}
-
-	return nil
 }
 
 func newMonitor(opts ...Option) Monitor {
diff --git a/proxy/grpc/grpc.go b/proxy/grpc/grpc.go
index 91333662..571822ea 100644
--- a/proxy/grpc/grpc.go
+++ b/proxy/grpc/grpc.go
@@ -135,8 +135,6 @@ func (p *Proxy) ServeRequest(ctx context.Context, req server.Request, rsp server
 			return err
 		}
 	}
-
-	return nil
 }
 
 // NewProxy returns a new grpc proxy server
diff --git a/proxy/http/http.go b/proxy/http/http.go
index 9bcf01db..64b4384b 100644
--- a/proxy/http/http.go
+++ b/proxy/http/http.go
@@ -187,8 +187,6 @@ func (p *Proxy) ServeRequest(ctx context.Context, req server.Request, rsp server
 			return errors.InternalServerError(req.Service(), err.Error())
 		}
 	}
-
-	return nil
 }
 
 // NewSingleHostProxy returns a router which sends requests to a single http backend
diff --git a/proxy/mucp/mucp.go b/proxy/mucp/mucp.go
index a202fe3d..0e04c7d6 100644
--- a/proxy/mucp/mucp.go
+++ b/proxy/mucp/mucp.go
@@ -437,7 +437,7 @@ func (p *Proxy) serveRequest(ctx context.Context, link client.Client, service, e
 	}
 
 	// create new request with raw bytes body
-	creq := link.NewRequest(service, endpoint, &bytes.Frame{body}, client.WithContentType(req.ContentType()))
+	creq := link.NewRequest(service, endpoint, &bytes.Frame{Data: body}, client.WithContentType(req.ContentType()))
 
 	// not a stream so make a client.Call request
 	if !req.Stream() {
@@ -493,8 +493,6 @@ func (p *Proxy) serveRequest(ctx context.Context, link client.Client, service, e
 			return err
 		}
 	}
-
-	return nil
 }
 
 // NewSingleHostProxy returns a proxy which sends requests to a single backend
diff --git a/registry/mdns_registry.go b/registry/mdns_registry.go
index 48782f76..fe952d22 100644
--- a/registry/mdns_registry.go
+++ b/registry/mdns_registry.go
@@ -105,7 +105,7 @@ func (m *mdnsRegistry) Register(service *Service, opts ...RegisterOption) error
 			return err
 		}
 
-		srv, err := mdns.NewServer(&mdns.Config{Zone: &mdns.DNSSDService{s}})
+		srv, err := mdns.NewServer(&mdns.Config{Zone: &mdns.DNSSDService{MDNSService: s}})
 		if err != nil {
 			return err
 		}
diff --git a/registry/service/handler/handler.go b/registry/service/handler/handler.go
index 2c33153a..e2042e5e 100644
--- a/registry/service/handler/handler.go
+++ b/registry/service/handler/handler.go
@@ -79,6 +79,4 @@ func (r *Registry) Watch(ctx context.Context, req *pb.WatchRequest, rsp pb.Regis
 			return errors.InternalServerError("go.micro.registry", err.Error())
 		}
 	}
-
-	return nil
 }
diff --git a/router/handler/router.go b/router/handler/router.go
index 90039871..971e2336 100644
--- a/router/handler/router.go
+++ b/router/handler/router.go
@@ -187,6 +187,4 @@ func (r *Router) Watch(ctx context.Context, req *pb.WatchRequest, stream pb.Rout
 			return err
 		}
 	}
-
-	return nil
 }
diff --git a/server/grpc/codec.go b/server/grpc/codec.go
index 53de36c3..356f8e81 100644
--- a/server/grpc/codec.go
+++ b/server/grpc/codec.go
@@ -169,7 +169,7 @@ func (g *grpcCodec) Write(m *codec.Message, v interface{}) error {
 		m.Body = b
 	}
 	// write the body using the framing codec
-	return g.s.SendMsg(&bytes.Frame{m.Body})
+	return g.s.SendMsg(&bytes.Frame{Data: m.Body})
 }
 
 func (g *grpcCodec) Close() error {
diff --git a/server/rpc_server.go b/server/rpc_server.go
index a22f13b6..191bf1e8 100644
--- a/server/rpc_server.go
+++ b/server/rpc_server.go
@@ -100,7 +100,7 @@ func (s *rpcServer) HandleEvent(e broker.Event) error {
 	rpcMsg := &rpcMessage{
 		topic:       msg.Header["Micro-Topic"],
 		contentType: ct,
-		payload:     &raw.Frame{msg.Body},
+		payload:     &raw.Frame{Data: msg.Body},
 		codec:       cf,
 		header:      msg.Header,
 		body:        msg.Body,
diff --git a/util/socket/socket.go b/util/socket/socket.go
index f536ad7d..e68df694 100644
--- a/util/socket/socket.go
+++ b/util/socket/socket.go
@@ -38,7 +38,6 @@ func (s *Socket) Accept(m *transport.Message) error {
 	case <-s.closed:
 		return io.EOF
 	}
-	return nil
 }
 
 // Process takes the next message off the send queue created by a call to Send