diff --git a/src/hb-map.hh b/src/hb-map.hh
index 3c9a98237..237bda731 100644
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
@@ -98,7 +98,7 @@ struct hb_hashmap_t
     bool operator == (const K &o) const { return hb_deref (key) == hb_deref (o); }
     bool operator == (const item_t &o) const { return *this == o.key; }
     hb_pair_t<K, V> get_pair() const { return hb_pair_t<K, V> (key, value); }
-    hb_pair_t<const K &, const V &> get_pair_ref() const { return hb_pair_t<const K &, const V &> (key, value); }
+    hb_pair_t<const K &, V &> get_pair_ref() { return hb_pair_t<const K &, V &> (key, value); }
 
     uint32_t total_hash () const
     { return (hash * 31) + hb_hash (value); }
diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh
index 3044d1fe3..f777f8581 100644
--- a/src/hb-subset-plan.hh
+++ b/src/hb-subset-plan.hh
@@ -82,7 +82,7 @@ struct hb_subset_plan_t
     hb_map_destroy (reverse_glyph_map);
 
 #ifdef HB_EXPERIMENTAL_API
-    for (auto _ : name_table_overrides)
+    for (auto _ : name_table_overrides.iter_ref ())
       _.second.fini ();
 #endif