diff --git a/openstack_dashboard/dashboards/admin/info/tabs.py b/openstack_dashboard/dashboards/admin/info/tabs.py
index 8c8ab0d849..cdda728073 100644
--- a/openstack_dashboard/dashboards/admin/info/tabs.py
+++ b/openstack_dashboard/dashboards/admin/info/tabs.py
@@ -32,7 +32,7 @@ class ServicesTab(tabs.TableTab):
     template_name = constants.INFO_DETAIL_TEMPLATE_NAME
 
     def generate_catalog_endpoints(self, catalog):
-        for i, service in enumerate(catalog):
+        for service in catalog:
             regions = set(endpoint['region'] for endpoint
                           in service['endpoints'])
             for region in regions:
diff --git a/openstack_dashboard/utils/settings.py b/openstack_dashboard/utils/settings.py
index 041901cca2..26a054d4ce 100644
--- a/openstack_dashboard/utils/settings.py
+++ b/openstack_dashboard/utils/settings.py
@@ -41,7 +41,7 @@ def import_dashboard_config(modules):
     """Imports configuration from all the modules and merges it."""
     config = collections.defaultdict(dict)
     for module in modules:
-        for key, submodule in import_submodules(module).items():
+        for submodule in import_submodules(module).values():
             if hasattr(submodule, 'DASHBOARD'):
                 dashboard = submodule.DASHBOARD
                 config[dashboard].update(submodule.__dict__)