3 files changed, 10 insertions, 6 deletions
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go
index 36a5311f0..1a04b4289 100644
--- a/pkg/api/handlers/compat/networks.go
+++ b/pkg/api/handlers/compat/networks.go
@@ -127,6 +127,12 @@ func getNetworkResourceByNameOrID(nameOrID string, runtime *libpod.Runtime, filt
 			containerEndpoints[con.ID()] = containerEndpoint
 		}
 	}
+
+	labels := network.GetNetworkLabels(conf)
+	if labels == nil {
+		labels = map[string]string{}
+	}
+
 	report := types.NetworkResource{
 		Name:       conf.Name,
 		ID:         network.GetNetworkID(conf.Name),
@@ -136,7 +142,7 @@ func getNetworkResourceByNameOrID(nameOrID string, runtime *libpod.Runtime, filt
 		EnableIPv6: false,
 		IPAM: dockerNetwork.IPAM{
 			Driver:  "default",
-			Options: nil,
+			Options: map[string]string{},
 			Config:  ipamConfigs,
 		},
 		Internal:   !bridge.IsGW,
@@ -145,8 +151,8 @@ func getNetworkResourceByNameOrID(nameOrID string, runtime *libpod.Runtime, filt
 		ConfigFrom: dockerNetwork.ConfigReference{},
 		ConfigOnly: false,
 		Containers: containerEndpoints,
-		Options:    nil,
-		Labels:     network.GetNetworkLabels(conf),
+		Options:    map[string]string{},
+		Labels:     labels,
 		Peers:      nil,
 		Services:   nil,
 	}
diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go
index b3c8b7ce4..1bf7ad460 100644
--- a/pkg/api/handlers/compat/resize.go
+++ b/pkg/api/handlers/compat/resize.go
@@ -11,7 +11,6 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
-	"k8s.io/client-go/tools/remotecommand"
 )
 
 func ResizeTTY(w http.ResponseWriter, r *http.Request) {
@@ -32,7 +31,7 @@ func ResizeTTY(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sz := remotecommand.TerminalSize{
+	sz := define.TerminalSize{
 		Width:  query.Width,
 		Height: query.Height,
 	}
diff --git a/pkg/api/server/register_pods.go b/pkg/api/server/register_pods.go
index 949bf80e2..c66cc48ff 100644
--- a/pkg/api/server/register_pods.go
+++ b/pkg/api/server/register_pods.go
@@ -36,7 +36,6 @@ func (s *APIServer) registerPodsHandlers(r *mux.Router) error {
 	//   name: create
 	//   description: attributes for creating a pod
 	//   schema:
-	//     type: object
 	//     $ref: "#/definitions/PodSpecGenerator"
 	// responses:
 	//   200: