diff --git a/mpc/apetag.cpp b/mpc/apetag.cpp
index 8ca61c18..b92a84fa 100644
--- a/mpc/apetag.cpp
+++ b/mpc/apetag.cpp
@@ -127,7 +127,7 @@ ByteVector APE::Tag::render() const
   }
 
   { Map<String,ByteVector>::Iterator i = d->unknowns.begin();
-    while (i != d->unknown.end()) {
+    while (i != d->unknowns.end()) {
       if (!i->second.isEmpty()) {
           data.append(i->second);
           itemCount++;
@@ -316,7 +316,7 @@ void APE::Tag::parse(const ByteVector &data, uint count)
           value = String(data.mid(pos+8+key.size()+1, vallen), String::UTF8);
           d->items.insert(key,value);
         } else {
-          d->unknown.insert(data.mid(pos, 8+key.size()+1+vallen));
+          d->unknowns.insert(key,data.mid(pos, 8+key.size()+1+vallen));
         }
 
         pos += 8+key.size()+1+vallen;
@@ -362,4 +362,4 @@ void APE::Tag::parse(const ByteVector &data, uint count)
       pos += 8+key.size()+1+vallen;
       count--;
     }
-}*/
\ No newline at end of file
+}*/
diff --git a/mpc/mpcfile.cpp b/mpc/mpcfile.cpp
index 06e39d35..6359ff84 100644
--- a/mpc/mpcfile.cpp
+++ b/mpc/mpcfile.cpp
@@ -112,7 +112,7 @@ MPC::Properties *MPC::File::audioProperties() const
 }
 
 
-void MPC::File::save()
+bool MPC::File::save()
 {
 
   // Update APE tag
@@ -131,6 +131,8 @@ void MPC::File::save()
     writeBlock(d->ID3v1Tag->render());
   }
 
+  return true;
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/mpc/mpcfile.h b/mpc/mpcfile.h
index 290cf230..e04a556b 100644
--- a/mpc/mpcfile.h
+++ b/mpc/mpcfile.h
@@ -81,7 +81,7 @@ namespace TagLib {
       /*!
        * Save the file.
        */
-      virtual void save();
+      virtual bool save();
 
     private:
       File(const File &);