diff --git a/plugins/base/plugin.go b/plugins/base/plugin.go
index a466d70a6..7f0219b29 100644
--- a/plugins/base/plugin.go
+++ b/plugins/base/plugin.go
@@ -33,7 +33,10 @@ type PluginBase struct {
 }
 
 func (p *PluginBase) GRPCServer(broker *plugin.GRPCBroker, s *grpc.Server) error {
-	proto.RegisterBasePluginServer(s, &basePluginServer{impl: p.impl})
+	proto.RegisterBasePluginServer(s, &basePluginServer{
+		impl:   p.impl,
+		broker: broker,
+	})
 	return nil
 }
 
diff --git a/plugins/base/plugin_test.go b/plugins/base/plugin_test.go
index 5c4568fab..2e7d1c19f 100644
--- a/plugins/base/plugin_test.go
+++ b/plugins/base/plugin_test.go
@@ -16,27 +16,27 @@ var (
 	// testSpec is an hcl Spec for testing
 	testSpec = &hclspec.Spec{
 		Block: &hclspec.Spec_Object{
-			&hclspec.Object{
+			Object: &hclspec.Object{
 				Attributes: map[string]*hclspec.Spec{
-					"foo": &hclspec.Spec{
+					"foo": {
 						Block: &hclspec.Spec_Attr{
-							&hclspec.Attr{
+							Attr: &hclspec.Attr{
 								Type:     "string",
 								Required: false,
 							},
 						},
 					},
-					"bar": &hclspec.Spec{
+					"bar": {
 						Block: &hclspec.Spec_Attr{
-							&hclspec.Attr{
+							Attr: &hclspec.Attr{
 								Type:     "number",
 								Required: true,
 							},
 						},
 					},
-					"baz": &hclspec.Spec{
+					"baz": {
 						Block: &hclspec.Spec_Attr{
-							&hclspec.Attr{
+							Attr: &hclspec.Attr{
 								Type: "bool",
 							},
 						},
diff --git a/plugins/shared/hclspec/dec.go b/plugins/shared/hclspec/dec.go
index b7721a357..a6ebb193b 100644
--- a/plugins/shared/hclspec/dec.go
+++ b/plugins/shared/hclspec/dec.go
@@ -82,8 +82,6 @@ func decodeSpecBlock(spec *Spec, impliedName string) (hcldec.Spec, hcl.Diagnosti
 		})
 		return nil, diags
 	}
-
-	return nil, nil
 }
 
 func decodeObjectSpec(obj *Object) (hcldec.Spec, hcl.Diagnostics) {
diff --git a/plugins/shared/hclspec/dec_test.go b/plugins/shared/hclspec/dec_test.go
index 40d9e988b..b490153c5 100644
--- a/plugins/shared/hclspec/dec_test.go
+++ b/plugins/shared/hclspec/dec_test.go
@@ -46,7 +46,7 @@ func TestDec_Convert_Object(t *testing.T) {
 				Block: &Spec_Object{
 					&Object{
 						Attributes: map[string]*Spec{
-							"foo": &Spec{
+							"foo": {
 								Block: &Spec_Attr{
 									&Attr{
 										Type:     "string",
@@ -54,7 +54,7 @@ func TestDec_Convert_Object(t *testing.T) {
 									},
 								},
 							},
-							"bar": &Spec{
+							"bar": {
 								Block: &Spec_Attr{
 									&Attr{
 										Type:     "number",
@@ -62,7 +62,7 @@ func TestDec_Convert_Object(t *testing.T) {
 									},
 								},
 							},
-							"baz": &Spec{
+							"baz": {
 								Block: &Spec_Attr{
 									&Attr{
 										Type: "bool",
@@ -106,7 +106,7 @@ func TestDec_Convert_Array(t *testing.T) {
 				Block: &Spec_Array{
 					Array: &Array{
 						Values: []*Spec{
-							&Spec{
+							{
 								Block: &Spec_Attr{
 									&Attr{
 										Name:     "foo",
@@ -115,7 +115,7 @@ func TestDec_Convert_Array(t *testing.T) {
 									},
 								},
 							},
-							&Spec{
+							{
 								Block: &Spec_Attr{
 									&Attr{
 										Name:     "bar",