diff --git a/src/controller/controller_statistics.cpp b/src/controller/controller_statistics.cpp
index 2dcb60c7..fd861151 100644
--- a/src/controller/controller_statistics.cpp
+++ b/src/controller/controller_statistics.cpp
@@ -47,9 +47,11 @@ void Controller::SharedMemStats(void * config){
 /// This function is called by parseStatistics.
 /// It updates the internally saved statistics data.
 void Controller::statStorage::update(IPC::statExchange & data) {
-  if (streamName == ""){
+  if (!streamName.size()){
     host = data.host();
     streamName = data.streamName();
+  }
+  if (!connector.size()){
     connector = data.connector();
   }
   statLog tmp;
diff --git a/src/output/output.cpp b/src/output/output.cpp
index 681f21ef..c5c2b3c9 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -343,7 +343,6 @@ namespace Mist {
     #endif
     
     sought = false;
-    capa.null();
   }
   
   /// Clears the buffer, sets parseData to false, and generally makes not very much happen at all.
diff --git a/src/output/output_hds.cpp b/src/output/output_hds.cpp
index 8c4ec6e7..37f39cd1 100644
--- a/src/output/output_hds.cpp
+++ b/src/output/output_hds.cpp
@@ -138,6 +138,7 @@ namespace Mist {
   
   void OutHDS::init(Util::Config * cfg){
     Output::init(cfg);
+    capa["name"] = "HDS";
     capa["desc"] = "Enables HTTP protocol Adobe-specific dynamic streaming (also known as HDS).";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/dynamic/$/manifest.f4m";
diff --git a/src/output/output_hls.cpp b/src/output/output_hls.cpp
index 637b9938..443f8e9f 100644
--- a/src/output/output_hls.cpp
+++ b/src/output/output_hls.cpp
@@ -90,7 +90,7 @@ namespace Mist {
   
   void OutHLS::init(Util::Config * cfg){
     Output::init(cfg);
-    capa["name"] = "HTTP_Live";
+    capa["name"] = "HLS";
     capa["desc"] = "Enables HTTP protocol Apple-specific streaming (also known as HLS).";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/hls/$/index.m3u8";
diff --git a/src/output/output_hss.cpp b/src/output/output_hss.cpp
index db021b16..39066742 100644
--- a/src/output/output_hss.cpp
+++ b/src/output/output_hss.cpp
@@ -53,7 +53,7 @@ namespace Mist {
 
   void OutHSS::init(Util::Config * cfg) {
     Output::init(cfg);
-    capa["name"] = "HTTP_Smooth";
+    capa["name"] = "HSS";
     capa["desc"] = "Enables HTTP protocol Microsoft-specific smooth streaming through silverlight (also known as HSS).";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/smooth/$.ism/Manifest";
diff --git a/src/output/output_json.cpp b/src/output/output_json.cpp
index 2e0f056e..d6263001 100644
--- a/src/output/output_json.cpp
+++ b/src/output/output_json.cpp
@@ -14,6 +14,7 @@ namespace Mist {
   
   void OutJSON::init(Util::Config * cfg){
     Output::init(cfg);
+    capa["name"] = "JSON";
     capa["desc"] = "Enables HTTP protocol JSON streaming.";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/$.json";
diff --git a/src/output/output_progressive_flv.cpp b/src/output/output_progressive_flv.cpp
index 5086fccc..3814c04c 100644
--- a/src/output/output_progressive_flv.cpp
+++ b/src/output/output_progressive_flv.cpp
@@ -12,7 +12,7 @@ namespace Mist {
   
   void OutProgressiveFLV::init(Util::Config * cfg){
     Output::init(cfg);
-    capa["name"] = "HTTP_Progressive_FLV";
+    capa["name"] = "FLV";
     capa["desc"] = "Enables HTTP protocol progressive streaming.";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/$.flv";
diff --git a/src/output/output_progressive_mp3.cpp b/src/output/output_progressive_mp3.cpp
index 70065bc6..4bec5714 100644
--- a/src/output/output_progressive_mp3.cpp
+++ b/src/output/output_progressive_mp3.cpp
@@ -12,7 +12,7 @@ namespace Mist {
   
   void OutProgressiveMP3::init(Util::Config * cfg){
     Output::init(cfg);
-    capa["name"] = "HTTP_Progressive_MP3";
+    capa["name"] = "MP3";
     capa["desc"] = "Enables HTTP protocol progressive streaming.";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/$.mp3";
diff --git a/src/output/output_progressive_mp4.cpp b/src/output/output_progressive_mp4.cpp
index 58625dd5..0180d570 100644
--- a/src/output/output_progressive_mp4.cpp
+++ b/src/output/output_progressive_mp4.cpp
@@ -13,7 +13,7 @@ namespace Mist {
   
   void OutProgressiveMP4::init(Util::Config * cfg){
     Output::init(cfg);
-    capa["name"] = "HTTP_Progressive_MP4";
+    capa["name"] = "MP4";
     capa["desc"] = "Enables HTTP protocol progressive streaming.";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/$.mp4";
diff --git a/src/output/output_srt.cpp b/src/output/output_srt.cpp
index 318d5c98..af7dcfa0 100644
--- a/src/output/output_srt.cpp
+++ b/src/output/output_srt.cpp
@@ -22,6 +22,7 @@ namespace Mist {
   
   void OutProgressiveSRT::init(Util::Config * cfg){
     Output::init(cfg);
+    capa["name"] = "SRT";
     capa["desc"] = "Enables HTTP protocol subtitle streaming.";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/$.srt";