diff --git a/heat/engine/stack.py b/heat/engine/stack.py
index a78828f333..57efc47958 100644
--- a/heat/engine/stack.py
+++ b/heat/engine/stack.py
@@ -1386,7 +1386,7 @@ class Stack(collections.Mapping):
     def _get_best_existing_rsrc_db(self, rsrc_name):
         candidate = None
         if self.ext_rsrcs_db:
-            for id, ext_rsrc in self.ext_rsrcs_db.items():
+            for ext_rsrc in self.ext_rsrcs_db.values():
                 if ext_rsrc.name != rsrc_name:
                     continue
                 if ext_rsrc.current_template_id == self.t.id:
diff --git a/heat/objects/raw_template.py b/heat/objects/raw_template.py
index f864c56d28..3a1ba35db7 100644
--- a/heat/objects/raw_template.py
+++ b/heat/objects/raw_template.py
@@ -89,7 +89,7 @@ class RawTemplate(
     @classmethod
     def encrypt_hidden_parameters(cls, tmpl):
         if cfg.CONF.encrypt_parameters_and_properties:
-            for param_name, param in tmpl.env.params.items():
+            for param_name in tmpl.env.params.keys():
                 if not tmpl.param_schemata()[param_name].hidden:
                     continue
                 clear_text_val = tmpl.env.params.get(param_name)