diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index abe142ed7..5ba090f4c 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -195,6 +195,7 @@ class File(models.Model):
         encoding = _detectEncoding(f)
         data = f.read()
         f.close()
+        data = data.replace('\r\n', '\n')
         try:
             data = unicode(data, encoding)
         except:
diff --git a/pandora/backend/models.py b/pandora/backend/models.py
index 1545be17a..443594dcc 100644
--- a/pandora/backend/models.py
+++ b/pandora/backend/models.py
@@ -464,7 +464,7 @@ class Item(models.Model):
 
     def updateStreams(self):
         files = {}
-        for f in self.files.filter(is_main=True, available=True):
+        for f in self.files.filter(is_main=True, is_video=True, available=True):
             files[utils.sort_title(f.name)] = f.video.path
         
         #FIXME: how to detect if something changed?