diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go
index 37100a437..7babd31d5 100644
--- a/drivers/docker/driver_test.go
+++ b/drivers/docker/driver_test.go
@@ -148,7 +148,7 @@ func dockerDriverHarness(t *testing.T, cfg map[string]interface{}) *drivers.Driv
 		Logger:    logger,
 		PluginDir: "./plugins",
 		InternalPlugins: map[loader.PluginID]*loader.InternalPluginConfig{
-			PluginID: &loader.InternalPluginConfig{
+			PluginID: {
 				Config: cfg,
 				Factory: func(hclog.Logger) interface{} {
 					return harness
@@ -985,13 +985,13 @@ func TestDockerDriver_Sysctl_Ulimit(t *testing.T) {
 
 func TestDockerDriver_Sysctl_Ulimit_Errors(t *testing.T) {
 	brokenConfigs := []map[string]string{
-		map[string]string{
+		{
 			"nofile": "",
 		},
-		map[string]string{
+		{
 			"nofile": "abc:1234",
 		},
-		map[string]string{
+		{
 			"nofile": "1234:abc",
 		},
 	}
diff --git a/drivers/docker/handle.go b/drivers/docker/handle.go
index 0d4fc4205..a49c1844c 100644
--- a/drivers/docker/handle.go
+++ b/drivers/docker/handle.go
@@ -36,7 +36,6 @@ type taskHandle struct {
 	waitCh                chan struct{}
 	removeContainerOnExit bool
 	net                   *structs.DriverNetwork
-	imageID               string
 
 	exitResult     *drivers.ExitResult
 	exitResultLock sync.Mutex
diff --git a/plugins/drivers/proto/driver.pb.go b/plugins/drivers/proto/driver.pb.go
index 794f935a3..7765d8414 100644
--- a/plugins/drivers/proto/driver.pb.go
+++ b/plugins/drivers/proto/driver.pb.go
@@ -1740,7 +1740,7 @@ type LinuxResources struct {
 	CpusetCpus string `protobuf:"bytes,6,opt,name=cpuset_cpus,json=cpusetCpus,proto3" json:"cpuset_cpus,omitempty"`
 	// CpusetMems constrains the allowed set of memory nodes. Default: "" (not specified)
 	CpusetMems string `protobuf:"bytes,7,opt,name=cpuset_mems,json=cpusetMems,proto3" json:"cpuset_mems,omitempty"`
-	// PercentTicks is a compatability option for docker and should not be used
+	// PercentTicks is a compatibility option for docker and should not be used
 	PercentTicks         float64  `protobuf:"fixed64,8,opt,name=PercentTicks,proto3" json:"PercentTicks,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
diff --git a/plugins/drivers/proto/driver.proto b/plugins/drivers/proto/driver.proto
index 9bfab4035..c61f49e8d 100644
--- a/plugins/drivers/proto/driver.proto
+++ b/plugins/drivers/proto/driver.proto
@@ -386,7 +386,7 @@ message LinuxResources {
     string cpuset_cpus = 6;
     // CpusetMems constrains the allowed set of memory nodes. Default: "" (not specified)
     string cpuset_mems = 7;
-    // PercentTicks is a compatability option for docker and should not be used
+    // PercentTicks is a compatibility option for docker and should not be used
     double PercentTicks = 8;
 }