diff --git a/setup/browser_data.py b/setup/browser_data.py
index 16b3f1fbab..7ee2e6263f 100644
--- a/setup/browser_data.py
+++ b/setup/browser_data.py
@@ -10,11 +10,13 @@ from datetime import datetime
 
 from setup import download_securely
 
+from polyglot.builtins import filter
+
 is_ci = os.environ.get('CI', '').lower() == 'true'
 
 
 def filter_ans(ans):
-    return filter(None, (x.strip() for x in ans))
+    return list(filter(None, (x.strip() for x in ans)))
 
 
 def common_user_agents():
diff --git a/setup/resources.py b/setup/resources.py
index b796ea2444..9855dad9dc 100644
--- a/setup/resources.py
+++ b/setup/resources.py
@@ -270,7 +270,7 @@ class RecentUAs(Command):  # {{{
         from setup.browser_data import get_data
         data = get_data()
         with open(self.UA_PATH, 'wb') as f:
-            f.write(json.dumps(data, indent=2))
+            f.write(json.dumps(data, indent=2).encode('utf-8'))
 # }}}