diff --git a/beets/library.py b/beets/library.py
index 43cac66e8..e4fbd1d49 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -1060,8 +1060,9 @@ def parse_query_parts(parts, model_cls):
 
     # Add path queries to aggregate query.
     # Match field / flexattr depending on whether the model has the path field
-    fast_query = 'path' in model_cls._fields
-    query.subqueries += [PathQuery('path', s, fast_query) for s in path_parts]
+    fast_path_query = 'path' in model_cls._fields
+    query.subqueries += [PathQuery('path', s, fast_path_query)
+                         for s in path_parts]
 
     return query, sort
 
diff --git a/beetsplug/importfeeds.py b/beetsplug/importfeeds.py
index d1d21f839..b1e76d9a8 100644
--- a/beetsplug/importfeeds.py
+++ b/beetsplug/importfeeds.py
@@ -63,7 +63,7 @@ def _write_m3u(m3u_path, items_paths):
     mkdirall(m3u_path)
     with open(syspath(m3u_path), 'a') as f:
         for path in items_paths:
-            f.write(path + '\n')
+            f.write(path + b'\n')
 
 
 class ImportFeedsPlugin(BeetsPlugin):