diff --git a/common/qubes_core b/common/qubes_core
index 9c972ead..7b63241d 100755
--- a/common/qubes_core
+++ b/common/qubes_core
@@ -32,6 +32,8 @@ start()
 	# xenstore-read fails
 	INTERFACE=eth0 /usr/lib/qubes/setup_ip
 
+	mkdir -p /var/run/qubes
+
 	if [ -e /dev/xvdb ] ; then
 		mount /rw
 
diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec
index 101b2260..634d1b9f 100644
--- a/rpm_spec/core-commonvm.spec
+++ b/rpm_spec/core-commonvm.spec
@@ -170,6 +170,8 @@ do
         chkconfig $srv off
 done
 
+[ -x /bin/systemctl ] && /bin/systemctl disable NetworkManager.service
+
 #echo "--> Enabling essential services..."
 chkconfig rsyslog on
 chkconfig haldaemon on