diff --git a/src/buffer/buffer_stream.cpp b/src/buffer/buffer_stream.cpp
index 84f74918..30aa4f77 100644
--- a/src/buffer/buffer_stream.cpp
+++ b/src/buffer/buffer_stream.cpp
@@ -63,14 +63,17 @@ namespace Buffer {
     Storage["totals"]["count"] = tot_count;
     Storage["totals"]["now"] = now;
     Storage["buffer"] = name;
-    ///\todo Fixme
-//    Storage["meta"] = Strm->metadata;
-    if (Storage["meta"].isMember("audio")){
-      Storage["meta"]["audio"].removeMember("init");
-    }
-    if (Storage["meta"].isMember("video")){
-      Storage["meta"]["video"].removeMember("init");
+
+    Storage["meta"] = Strm->metadata;
+
+    if(Storage["meta"].isMember("tracks") && Storage["meta"]["tracks"].size() > 0){
+      for(JSON::ObjIter it = Storage["meta"]["tracks"].ObjBegin(); it != Storage["meta"]["tracks"].ObjEnd(); it++){
+        it->second.removeMember("init");
+        it->second.removeMember("keys");
+        it->second.removeMember("frags");
+      }
     }
+
     ret = Storage.toString();
     Storage["log"].null();
     return ret;
diff --git a/src/connectors/embed.js b/src/connectors/embed.js
index 4a7365a7..31d04485 100644
--- a/src/connectors/embed.js
+++ b/src/connectors/embed.js
@@ -139,10 +139,10 @@ function mistembed(streamname)
   }else{
     // no error, and sources found. Check the video types and output the best
     // available video player.
-    var i, video, 
-          vtype = video.type ? video.type : 'unknown';
-       foundPlayer = false,
-       len = video.source.length;
+    var i,
+        vtype = (video.type ? video.type : 'unknown'),
+        foundPlayer = false,
+        len = video.source.length;
 
     for(i = 0; i < len; i++)
     {