diff --git a/xos/admin.py b/xos/admin.py
index 80bc142..f05b369 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -88,7 +88,7 @@
     suit_form_includes = ( # ('vtnadmin.html', 'top', 'administration'),
                            ) #('hpctools.html', 'top', 'tools') )
 
-    def queryset(self, request):
+    def get_queryset(self, request):
         return VTNService.get_service_objects_by_user(request.user)
 
 admin.site.register(VTNService, VTNServiceAdmin)
diff --git a/xos/synchronizer/steps/sync_port_addresses.py b/xos/synchronizer/steps/sync_port_addresses.py
index 553df6f..02e8df6 100644
--- a/xos/synchronizer/steps/sync_port_addresses.py
+++ b/xos/synchronizer/steps/sync_port_addresses.py
@@ -83,7 +83,12 @@
                 continue
             try:
                 driver = self.driver.admin_driver(controller = controller)
-                ports = driver.shell.quantum.list_ports()["ports"]
+                # FIXME: after LTS merge, use neutron (new name) instead of quantum (old name)
+                # the following if is a workaround
+                if hasattr( driver.shell, "neutron"):
+                    ports = driver.shell.neutron.list_ports()["ports"]
+                else:
+                    ports = driver.shell.quantum.list_ports()["ports"]
             except:
                 logger.log_exc("failed to get ports from controller %s" % controller)
                 continue
@@ -123,11 +128,9 @@
 
             if changed:
                 logger.info("updating port %s" % port)
-                driver.shell.quantum.update_port(port.port_id, {"port": {"allowed_address_pairs": aaps}})
-
-
-
-
-
-
+                # FIXME: See FIXME above, remove after LTS merge
+                if hasattr( driver.shell, "neutron"):
+                    driver.shell.neutron.update_port(port.port_id, {"port": {"allowed_address_pairs": aaps}})
+                else:
+                    driver.shell.quantum.update_port(port.port_id, {"port": {"allowed_address_pairs": aaps}})