diff --git a/mysql b/mysql
index fa7f0ebf1..bf334ccb4 160000
--- a/mysql
+++ b/mysql
@@ -1 +1 @@
-Subproject commit fa7f0ebf17228b594553cc9215e4ba4bebbc3c1a
+Subproject commit bf334ccb4ecd2136ba180e9365eb71e5532cdd13
diff --git a/nova/manifests/compute/xenserver.pp b/nova/manifests/compute/xenserver.pp
index e74fbd46d..6ace300dd 100644
--- a/nova/manifests/compute/xenserver.pp
+++ b/nova/manifests/compute/xenserver.pp
@@ -8,7 +8,7 @@ class nova::compute::xenserver(
   $enabled=true
 ) {
 
-  class { 'nova':
+  class { 'nova::compute':
     enabled => $enabled,
   }
   nova_config {
diff --git a/nova/manifests/init.pp b/nova/manifests/init.pp
index 7925e27ec..a40818038 100644
--- a/nova/manifests/init.pp
+++ b/nova/manifests/init.pp
@@ -3,9 +3,9 @@ class nova(
   $nova_cluster_id='localcluster',
   $sql_connection = false,
   $network_manager='nova.network.manager.FlatManager',
+  $flat_network_bridge,
   $image_service,
   # is flat_network_bridge valid if network_manager is not FlatManager?
-  $flat_network_bridge,
   $glance_host,
   $glance_port, # default is 9292
   $allow_admin_api,
@@ -16,7 +16,6 @@ class nova(
   $rabbit_virtual_host,
   # Following may need to be broken out to different nova services
   $service_down_time,
-  # TODO - do we really want to enforce the defaults here?
   $quota_instances = 10,
   $quota_cores = 20,
   $quota_volumes = 10,
diff --git a/nova/manifests/rackspace/all.pp b/nova/manifests/rackspace/all.pp
index 66dbe30d6..ead0eebb9 100644
--- a/nova/manifests/rackspace/all.pp
+++ b/nova/manifests/rackspace/all.pp
@@ -92,8 +92,7 @@ class nova::rackspace::all(
   }
 
   class { "nova::api": enabled => false }
-  class { "nova::compute":
-    compute_type 	             => $compute_type,
+  class { "nova::compute::xenserver":
     host                       => $host,
     xenapi_connection_url      => $xenapi_connection_url,
     xenapi_connection_username => $xenapi_connection_username,
diff --git a/nova/manifests/rackspace/dev.pp b/nova/manifests/rackspace/dev.pp
index d51172511..ee124e315 100644
--- a/nova/manifests/rackspace/dev.pp
+++ b/nova/manifests/rackspace/dev.pp
@@ -7,7 +7,6 @@ class nova::rackspace::dev() {
       'bzr',
       'git',
       'gcc',
-      'gcc::swig',
       # I may need to move python-mysqldb to elsewhere if it depends on mysql
       # python-nova pulls in all of the deps mentioned here
       'python',