diff --git a/api/client/idresolver/idresolver.go b/api/client/idresolver/idresolver.go
index b958bd0672..9b38d151bb 100644
--- a/api/client/idresolver/idresolver.go
+++ b/api/client/idresolver/idresolver.go
@@ -28,7 +28,7 @@ func New(client client.APIClient, noResolve bool) *IDResolver {
 func (r *IDResolver) get(ctx context.Context, t interface{}, id string) (string, error) {
 	switch t.(type) {
 	case swarm.Node:
-		node, err := r.client.NodeInspect(ctx, id)
+		node, _, err := r.client.NodeInspectWithRaw(ctx, id)
 		if err != nil {
 			return id, nil
 		}
diff --git a/api/client/node/inspect.go b/api/client/node/inspect.go
index 8cd6548c49..2ac0cd40fa 100644
--- a/api/client/node/inspect.go
+++ b/api/client/node/inspect.go
@@ -49,7 +49,7 @@ func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error {
 		if err != nil {
 			return nil, nil, err
 		}
-		node, err := client.NodeInspect(ctx, nodeRef)
+		node, _, err := client.NodeInspectWithRaw(ctx, nodeRef)
 		return node, nil, err
 	}
 
diff --git a/api/client/node/tasks.go b/api/client/node/tasks.go
index 8d45bc743d..f09d815027 100644
--- a/api/client/node/tasks.go
+++ b/api/client/node/tasks.go
@@ -48,7 +48,7 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
 	if err != nil {
 		return nil
 	}
-	node, err := client.NodeInspect(ctx, nodeRef)
+	node, _, err := client.NodeInspectWithRaw(ctx, nodeRef)
 	if err != nil {
 		return err
 	}
diff --git a/api/client/node/update.go b/api/client/node/update.go
index cc70fc79c5..840182de0c 100644
--- a/api/client/node/update.go
+++ b/api/client/node/update.go
@@ -42,7 +42,7 @@ func updateNodes(dockerCli *client.DockerCli, nodes []string, mergeNode func(nod
 	ctx := context.Background()
 
 	for _, nodeID := range nodes {
-		node, err := client.NodeInspect(ctx, nodeID)
+		node, _, err := client.NodeInspectWithRaw(ctx, nodeID)
 		if err != nil {
 			return err
 		}
diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go
index 160492b58c..36a8cb246f 100644
--- a/daemon/cluster/executor/container/container.go
+++ b/daemon/cluster/executor/container/container.go
@@ -117,8 +117,8 @@ func (c *containerConfig) config() *enginecontainer.Config {
 		// If Command is provided, we replace the whole invocation with Command
 		// by replacing Entrypoint and specifying Cmd. Args is ignored in this
 		// case.
-		config.Entrypoint = append(config.Entrypoint, c.spec().Command[0])
-		config.Cmd = append(config.Cmd, c.spec().Command[1:]...)
+		config.Entrypoint = append(config.Entrypoint, c.spec().Command...)
+		config.Cmd = append(config.Cmd, c.spec().Args...)
 	} else if len(c.spec().Args) > 0 {
 		// In this case, we assume the image has an Entrypoint and Args
 		// specifies the arguments for that entrypoint.
diff --git a/daemon/start_linux.go b/daemon/start_linux.go
index 6a96b699d6..c6ad22af85 100644
--- a/daemon/start_linux.go
+++ b/daemon/start_linux.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/engine-api/types"
 )
 
 func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Container) (*[]libcontainerd.CreateOption, error) {
@@ -13,7 +12,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
 
 	// Ensure a runtime has been assigned to this container
 	if container.HostConfig.Runtime == "" {
-		container.HostConfig.Runtime = types.DefaultRuntimeName
+		container.HostConfig.Runtime = stockRuntimeName
 		container.ToDisk()
 	}