diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go
index e3ee7d471e..89af3b4748 100644
--- a/cmd/kops/create_cluster.go
+++ b/cmd/kops/create_cluster.go
@@ -534,13 +534,9 @@ func parseZoneList(s string) []string {
 }
 
 func supportsPrivateTopology(n *api.NetworkingSpec) bool {
-	if n.CNI != nil {
-		return true
-	}
-	if n.Kopeio != nil {
-		return true
-	}
-	if n.Weave != nil {
+
+
+	if n.CNI != nil && n.Kopeio != nil && n.Weave != nil {
 		return true
 	}
 	return false
diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
index 8b0b505708..b474d79932 100644
--- a/pkg/apis/kops/networking.go
+++ b/pkg/apis/kops/networking.go
@@ -23,7 +23,7 @@ type NetworkingSpec struct {
 	External *ExternalNetworkingSpec `json:"external,omitempty"`
 	CNI      *CNINetworkingSpec      `json:"cni,omitempty"`
 	Kopeio   *KopeioNetworkingSpec   `json:"kopeio,omitempty"`
-	Weave    *WeaveNetworkingSpec    `json:"kopeio,omitempty"`
+	Weave    *WeaveNetworkingSpec    `json:"weave,omitempty"`
 }
 
 // ClassicNetworkingSpec is the specification of classic networking mode, integrated into kubernetes
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index e9b3b8baf1..106ab2c220 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -71,11 +71,11 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 		Manifest: fi.String("dns-controller/v1.4.1.yaml"),
 	})
 
-	// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
 	if b.cluster.Spec.Networking.Kopeio != nil {
 		key := "networking.kope.io"
 		version := "1.0.20161116"
 
+		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
 		location := key + "/v" + version + ".yaml"
 
 		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
@@ -92,6 +92,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 		key := "networking.weave.io"
 		version := "1.8.0.20161116"
 
+		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
 		location := key + "/v" + version + ".yaml"
 
 		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{