diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py
index adde4a5d..9d2a6cca 100644
--- a/hooks/nova_compute_utils.py
+++ b/hooks/nova_compute_utils.py
@@ -127,7 +127,7 @@ def resource_map():
     # FlatDHCPManager only requires some extra packages.
     if (net_manager in ['flatmanager', 'flatdhcpmanager'] and
             config('multi-host').lower() == 'yes'):
-        resource_map['/etc/nova/nova.conf']['services'].extend(
+        resource_map[NOVA_CONF]['services'].extend(
             ['nova-api', 'nova-network']
         )
 
@@ -319,9 +319,9 @@ def configure_live_migration(configs=None):
     # dont think we need this
     return
     configs = configs or register_configs()
-    configs.write('/etc/libvirt/libvirtd.conf')
-    configs.write('/etc/default/libvirt-bin')
-    configs.write('/etc/nova/nova.conf')
+    configs.write(LIBVIRTD_CONF)
+    configs.write(LIBVIRT_BIN)
+    configs.write(NOVA_CONF)
 
     if not migration_enabled():
         return
diff --git a/templates/neutron.conf b/templates/neutron.conf
index 1b81f8c4..d5583aef 100644
--- a/templates/neutron.conf
+++ b/templates/neutron.conf
@@ -13,7 +13,6 @@ core_plugin =  {{ core_plugin }}
 {% endif -%}
 api_paste_config = /etc/neutron/api-paste.ini
 auth_strategy = keystone
-control_exchange = quantum
 notification_driver = neutron.openstack.common.notifier.rpc_notifier
 default_notification_level = INFO
 notification_topics = notifications