diff --git a/metropolis/node/core/curator/BUILD.bazel b/metropolis/node/core/curator/BUILD.bazel
index 42cdffa..ee35c80 100644
--- a/metropolis/node/core/curator/BUILD.bazel
+++ b/metropolis/node/core/curator/BUILD.bazel
@@ -43,6 +43,7 @@
         "//osbase/supervisor",
         "@com_github_google_cel_go//cel:go_default_library",
         "@com_github_google_cel_go//checker/decls:go_default_library",
+        "@com_github_google_cel_go//common/decls:go_default_library",
         "@com_github_google_cel_go//common/types:go_default_library",
         "@com_github_google_go_cmp//cmp",
         "@com_zx2c4_golang_wireguard_wgctrl//wgtypes",
diff --git a/metropolis/node/core/curator/filters.go b/metropolis/node/core/curator/filters.go
index c569d3b..7d4f929 100644
--- a/metropolis/node/core/curator/filters.go
+++ b/metropolis/node/core/curator/filters.go
@@ -10,6 +10,7 @@
 
 	"github.com/google/cel-go/cel"
 	celdecls "github.com/google/cel-go/checker/decls"
+	"github.com/google/cel-go/common/decls"
 	celtypes "github.com/google/cel-go/common/types"
 	exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
 	"google.golang.org/grpc/codes"
@@ -33,6 +34,8 @@
 			},
 		))
 	}
+
+	// nolint:SA1019
 	return cel.Declarations(ds...)
 }
 
@@ -104,9 +107,7 @@
 	// node-specific CEL environment options.
 	fprg, err := buildFilter(ctx, expr,
 		cel.Types(&apb.Node{}),
-		cel.Declarations(
-			celdecls.NewVar("node", celdecls.NewTypeParamType("metropolis.proto.api.Node")),
-		),
+		cel.VariableDecls(decls.NewVariable("node", celtypes.NewTypeParamType("metropolis.proto.api.Node"))),
 		// There doesn't seem to be an easier way of importing protobuf enums
 		// into CEL environments.
 		enumDeclarations(cpb.NodeState_name),
diff --git a/metropolis/node/kubernetes/csi.go b/metropolis/node/kubernetes/csi.go
index be9e3f5..92c700e 100644
--- a/metropolis/node/kubernetes/csi.go
+++ b/metropolis/node/kubernetes/csi.go
@@ -266,6 +266,8 @@
 // in Kubelet which requires it to remove and recreate its gRPC socket for
 // every new registration attempt.
 type pluginRegistrationServer struct {
+	pluginregistration.UnimplementedRegistrationServer
+
 	// regErr has a buffer of 1, so that at least one error can always be
 	// sent into it in a non-blocking way. There is a race if
 	// NotifyRegistrationStatus is called twice with an error as the buffered
diff --git a/metropolis/node/kubernetes/hyperkube/main.go b/metropolis/node/kubernetes/hyperkube/main.go
index 5c76acf..3807d0f 100644
--- a/metropolis/node/kubernetes/hyperkube/main.go
+++ b/metropolis/node/kubernetes/hyperkube/main.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"os"
 
@@ -33,7 +34,7 @@
 	"kube-apiserver":          kubeapiserver.NewAPIServerCommand,
 	"kube-controller-manager": kubecontrollermanager.NewControllerManagerCommand,
 	"kube-scheduler":          func() *cobra.Command { return kubescheduler.NewSchedulerCommand() },
-	"kubelet":                 kubelet.NewKubeletCommand,
+	"kubelet":                 func() *cobra.Command { return kubelet.NewKubeletCommand(context.Background()) },
 }
 
 func main() {
diff --git a/metropolis/node/kubernetes/plugins/kvmdevice/kvmdevice.go b/metropolis/node/kubernetes/plugins/kvmdevice/kvmdevice.go
index b75831a..15f1d9e 100644
--- a/metropolis/node/kubernetes/plugins/kvmdevice/kvmdevice.go
+++ b/metropolis/node/kubernetes/plugins/kvmdevice/kvmdevice.go
@@ -35,7 +35,8 @@
 var Name corev1.ResourceName = "devices.monogon.dev/kvm"
 
 type Plugin struct {
-	*deviceplugin.UnimplementedDevicePluginServer
+	deviceplugin.UnimplementedDevicePluginServer
+	pluginregistration.UnimplementedRegistrationServer
 	KubeletDirectory *localstorage.DataKubernetesKubeletDirectory
 
 	logger logging.Leveled
@@ -86,7 +87,7 @@
 
 	for _, req := range req.ContainerRequests {
 		var devices []*deviceplugin.DeviceSpec
-		for range req.DevicesIDs {
+		for range req.DevicesIds {
 			dev := new(deviceplugin.DeviceSpec)
 			dev.HostPath = "/dev/kvm"
 			dev.ContainerPath = "/dev/kvm"