diff --git a/manila/keymgr/barbican.py b/manila/keymgr/barbican.py
index 51cbd9b327..7d6e069fe9 100644
--- a/manila/keymgr/barbican.py
+++ b/manila/keymgr/barbican.py
@@ -88,8 +88,8 @@ def get_client_and_href(self, context, secret_ref):
         # session of barbican user to get its user_id. Grant ACL to barbican
         # user that it will be used for the key_ref handover process.
         try:
-            user_barbican_client, base_url = self._get_barbican_client(context)
-            secret_ref = self._create_secret_ref(base_url, secret_ref)
+            user_barbican_client = self._get_barbican_client(context)
+            secret_ref = self._create_secret_ref(secret_ref)
         except Exception as e:
             LOG.error("Failed to create barbican client. Error: %s", e)
             raise exception.ManilaBarbicanACLError()
diff --git a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
index dcc564ad58..0c954351f8 100644
--- a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
+++ b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
@@ -1123,9 +1123,9 @@ def _check_reuse_share_server(self, share_server, nfs_config, share=None,
                   'configured for the existing share_servers')
         if (encryption_key_ref and encryption_key_ref !=
            share_server['encryption_key_ref']):
-            msg = _('The available share server %(server_id)s is already'
-                    'configured with a different encryption-key-ref',
-                    {'server_id': share_server['id']})
+            msg = _('The available share server %(server_id)s is already '
+                    'configured with a different encryption-key-ref') % {
+                        'server_id': share_server['id']}
             LOG.warning(msg)
             return False
 
diff --git a/manila/share/drivers/netapp/dataontap/protocols/cifs_cmode.py b/manila/share/drivers/netapp/dataontap/protocols/cifs_cmode.py
index 93174b3d1e..ef2afee9af 100644
--- a/manila/share/drivers/netapp/dataontap/protocols/cifs_cmode.py
+++ b/manila/share/drivers/netapp/dataontap/protocols/cifs_cmode.py
@@ -105,6 +105,7 @@ def update_access(self, share, share_name, rules, replica=False):
         _, cifs_share_name = self._get_export_location(share)
         existing_rules = self._get_access_rules(share, cifs_share_name)
 
+
         # Update rules in an order that will prevent transient disruptions
         self._handle_added_rules(cifs_share_name, existing_rules, new_rules)
         self._handle_ro_to_rw_rules(cifs_share_name, existing_rules, new_rules)