diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index 229c4755..47a5b79d 100644
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -79,6 +79,11 @@ MP4::Tag::Tag(File *file, MP4::Atoms *atoms)
   }
 }
 
+MP4::Tag::~Tag()
+{
+  delete d;
+}
+
 ByteVectorList
 MP4::Tag::parseData(MP4::Atom *atom, TagLib::File *file, int expectedFlags, bool freeForm)
 {
@@ -167,7 +172,7 @@ MP4::Tag::parseFreeForm(MP4::Atom *atom, TagLib::File *file)
     for(unsigned int i = 2; i < data.size(); i++) {
       value.append(String(data[i], String::UTF8));
     }
-    String name = "----:" + data[0] + ":" + data[1];
+    String name = "----:" + data[0] + ':' + data[1];
     d->items.insert(name, value);
   }
 }
diff --git a/taglib/mp4/mp4tag.h b/taglib/mp4/mp4tag.h
index 4671d16c..41b76657 100644
--- a/taglib/mp4/mp4tag.h
+++ b/taglib/mp4/mp4tag.h
@@ -45,6 +45,7 @@ namespace TagLib {
     {
     public:
         Tag(TagLib::File *file, Atoms *atoms);
+        ~Tag();
         bool save();
 
         String title() const;