diff --git a/src/exif.cpp b/src/exif.cpp
index bf5de5ac..e3d6f163 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -601,12 +601,12 @@ namespace Exiv2 {
 
     void ExifData::sortByKey()
     {
-        std::sort(exifMetadata_.begin(), exifMetadata_.end(), cmpMetadataByKey);
+        exifMetadata_.sort(cmpMetadataByKey);
     }
 
     void ExifData::sortByTag()
     {
-        std::sort(exifMetadata_.begin(), exifMetadata_.end(), cmpMetadataByTag);
+        exifMetadata_.sort(cmpMetadataByTag);
     }
 
     ExifData::iterator ExifData::erase(ExifData::iterator beg, ExifData::iterator end)
diff --git a/src/exif.hpp b/src/exif.hpp
index 3db22901..e4637d3e 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -38,7 +38,7 @@
 
 // + standard includes
 #include <string>
-#include <vector>
+#include <list>
 #include <memory>
 
 // *****************************************************************************
@@ -423,7 +423,7 @@ namespace Exiv2 {
     }; // class ExifThumb
 
     //! Container type to hold all metadata
-    typedef std::vector<Exifdatum> ExifMetadata;
+    typedef std::list<Exifdatum> ExifMetadata;
 
     /*!
       @brief A container for Exif data.  This is a top-level class of the %Exiv2
diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 02ec63d4..2fa2b317 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -161,8 +161,7 @@ namespace Exiv2 {
 
     bool TiffGroupInfo::operator==(const std::string& groupName) const
     {
-        std::string name(name_);
-        return name == groupName;
+        return 0 == strcmp(name_, groupName.c_str());
     }
 
     const char* tiffGroupName(uint16_t group)