diff --git a/octodns/manager.py b/octodns/manager.py
index 9a1b598..1a86336 100644
--- a/octodns/manager.py
+++ b/octodns/manager.py
@@ -254,7 +254,7 @@ class Manager(object):
 
         zones = self.config['zones'].items()
         if eligible_zones:
-            zones = filter(lambda d: d[0] in eligible_zones, zones)
+            zones = [z for z in zones if z[0] in eligible_zones]
 
         futures = []
         for zone_name, config in zones:
diff --git a/octodns/source/tinydns.py b/octodns/source/tinydns.py
index 0ee100a..9c44ed8 100755
--- a/octodns/source/tinydns.py
+++ b/octodns/source/tinydns.py
@@ -253,7 +253,7 @@ class TinyDnsFileSource(TinyDnsBaseSource):
                     # Ignore hidden files
                     continue
                 with open(join(self.directory, filename), 'r') as fh:
-                    lines += filter(lambda l: l, fh.read().split('\n'))
+                    lines += [l for l in fh.read().split('\n') if l]
 
             self._cache = lines