diff --git a/rtengine/metadata.cc b/rtengine/metadata.cc
index 884c8a9a1..732133785 100644
--- a/rtengine/metadata.cc
+++ b/rtengine/metadata.cc
@@ -76,7 +76,8 @@ std::unique_ptr<Exiv2::Image> open_exiv2(const Glib::ustring& fname)
 #endif
         throw Exiv2::Error(error_code, "exiv2: invalid image");
     }
-    return image;
+    std::unique_ptr<Exiv2::Image> ret(image.release());
+    return ret;
 }
 
 } // namespace
diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc
index c44a4f8d2..44c70bc12 100644
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -632,7 +632,7 @@ void ExifPanel::onEditExifTagValue(const Glib::ustring &path, const Glib::ustrin
     auto row = *it;
     std::string key = row[exifColumns.key];
 
-    changeList[key] = value;
+    (*changeList)[key] = value;
     if (!all_keys_active()) {
         cur_active_keys_.insert(key);
     }