diff --git a/neutron/_modules/neutronng.py b/_modules/neutronng.py
similarity index 100%
rename from neutron/_modules/neutronng.py
rename to _modules/neutronng.py
diff --git a/neutron/_states/neutronng.py b/_states/neutronng.py
similarity index 97%
rename from neutron/_states/neutronng.py
rename to _states/neutronng.py
index df0736d..9d4deaa 100644
--- a/neutron/_states/neutronng.py
+++ b/_states/neutronng.py
@@ -86,8 +86,11 @@
         tenant_id = None
         LOG.debug('Cannot get the tenant id. User {0} is not an admin.'.format(
             connection_args['connection_user']))
-    existing_network = _neutron_module_call(
-        'list_networks', name=name, **connection_args)
+    existing_networks = _neutron_module_call(
+        'list_networks', **connection_args)
+    for network in existing_networks:
+        if network.get(name) == name:
+            existing_network = network
     network_arguments = _get_non_null_args(
         name=name,
         provider_network_type=provider_network_type,
@@ -101,8 +104,11 @@
     if not existing_network:
         network_arguments.update(connection_args)
         _neutron_module_call('create_network', **network_arguments)
-        existing_network = _neutron_module_call(
-            'list_networks', name=name, **connection_args)
+        existing_networks = _neutron_module_call(
+            'list_networks', **connection_args)
+        for network in existing_networks:
+            if network.get(name) == name:
+                existing_network = network
         if existing_network:
             return _created(name, 'network', existing_network[name])
         return _update_failed(name, 'network')
diff --git a/neutron/map.jinja b/neutron/map.jinja
index 0eaf45f..d00f754 100644
--- a/neutron/map.jinja
+++ b/neutron/map.jinja
@@ -1,7 +1,7 @@
 
 {% set compute = salt['grains.filter_by']({
     'Debian': {
-        'pkgs': ['neutron-openvswitch-agent', 'openvswitch-switch', 'openvswitch-datapath-dkms', 'python-pycadf'],
+        'pkgs': ['neutron-openvswitch-agent', 'openvswitch-switch', 'python-pycadf'],
         'services': ['neutron-openvswitch-agent'],
         'audit': {
           'enabled': false
diff --git a/neutron/meta/heka.yml b/neutron/meta/heka.yml
index b14c967..1fc60ff 100644
--- a/neutron/meta/heka.yml
+++ b/neutron/meta/heka.yml
@@ -28,7 +28,10 @@
     neutron_log:
       engine: logstreamer
       log_directory: "/var/log"
-      file_match: 'neutron/(?P<Service>(dhcp-agent|l3-agent|metadata-agent|neutron-netns-cleanup|openvswitch-agent|neutron-lbaas-agent|server))\.log\.?(?P<Seq>\d*)$'
+      # Depending on the package version, the Neutron server logs are either at
+      # /var/log/neutron/neutron-server.log or /var/log/neutron/server.log and
+      # the following regexp will deal with both situations.
+      file_match: 'neutron/(neutron-)?(?P<Service>(dhcp-agent|l3-agent|metadata-agent|neutron-netns-cleanup|openvswitch-agent|neutron-lbaas-agent|server))\.log\.?(?P<Seq>\d*)$'
       differentiator: ['neutron', '_', 'Service']
       priority: ["^Seq"]
       decoder: "neutron_decoder"