diff --git a/alpine/packages/diagnostics/diagnostics b/alpine/packages/diagnostics/diagnostics
index da06ad584..3c5c56f71 100755
--- a/alpine/packages/diagnostics/diagnostics
+++ b/alpine/packages/diagnostics/diagnostics
@@ -10,8 +10,11 @@ DEV=$(mount | grep '/dev/[sxv]da. on /var type')
 [ $? -eq 0 ] && printf "✓ Drive mounted: $DEV\n" || printf "✗ No drive mounted\n"
 INET=$(ifconfig eth0 2> /dev/null | grep 'inet addr')
 [ $? -eq 0 ] && printf "✓ Network connected: $INET\n" || printf "✗ No network connection\n"
-FUSE=$(ps -eo args | grep '^/sbin/transfused')
-[ $? -eq 0 ] && printf "✓ Process transfused running\n" || printf "✗ No transfused process\n"
+if [ ! -d /sys/bus/vmbus ]
+then
+	FUSE=$(ps -eo args | grep '^/sbin/transfused')
+	[ $? -eq 0 ] && printf "✓ Process transfused running\n" || printf "✗ No transfused process\n"
+fi
 if [ -d /sys/bus/vmbus ]
 then
 	TAPVS=$(ps -eo args | grep '^/sbin/tap-vsockd')
diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker
index a1f43538f..1636846c8 100755
--- a/alpine/packages/docker/etc/init.d/docker
+++ b/alpine/packages/docker/etc/init.d/docker
@@ -13,9 +13,13 @@ start()
 
 	pidfile="/run/docker.pid"
 
-	# Start with networking on both Mac and Hyper-V, but in
-	# future change this to use a hypervisor socket.
-	DOCKER_OPTS="${DOCKER_OPTS} -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock"
+	# Only start with networking on cloud editions
+	DOCKER_OPTS="${DOCKER_OPTS} -H unix:///var/run/docker.sock"
+	if [ ! -z $(bootflag cloud_provider) ]
+	then
+		# TODO: More elegant way to turn on "debug mode"
+		DOCKER_OPTS="${DOCKER_OPTS} -H 0.0.0.0:2375"
+	fi
 
 	# some config is always in /etc/docker cannot specify alternative eg certs
 	if mobyconfig exists etc/docker
diff --git a/alpine/packages/transfused/etc/init.d/transfused b/alpine/packages/transfused/etc/init.d/transfused
index 4cad75fcf..473edb0d0 100755
--- a/alpine/packages/transfused/etc/init.d/transfused
+++ b/alpine/packages/transfused/etc/init.d/transfused
@@ -4,6 +4,7 @@ description="fuse proxy server"
 
 start()
 {
+	[ -d /sys/bus/vmbus ] && exit 0
 	ebegin "Starting FUSE socket passthrough"
 
 	mkdir -p /host_docker_app
@@ -27,6 +28,7 @@ start()
 
 stop()
 {
+	[ -d /sys/bus/vmbus ] && exit 0
 	ebegin "Stopping FUSE socket passthrough"
 
 	PIDFILE=/var/run/transfused.pid