diff --git a/src/gen/lib/addressbase.py b/src/gen/lib/addressbase.py
index 03c2bf59c..48cd5d8be 100644
--- a/src/gen/lib/addressbase.py
+++ b/src/gen/lib/addressbase.py
@@ -63,7 +63,7 @@ class AddressBase(object):
         """
         Convert a serialized tuple of data to an object.
         """
-        self.address_list = map(Address().unserialize, data)
+        self.address_list = [Address().unserialize(item) for item in data]
 
     def add_address(self, address):
         """
diff --git a/src/gen/lib/attrbase.py b/src/gen/lib/attrbase.py
index b5ccbd3a7..c7cb06a67 100644
--- a/src/gen/lib/attrbase.py
+++ b/src/gen/lib/attrbase.py
@@ -67,7 +67,7 @@ class AttributeBase(object):
         """
         Convert a serialized tuple of data to an object.
         """
-        self.attribute_list = map(Attribute().unserialize, data)
+        self.attribute_list = [Attribute().unserialize(item) for item in data]
 
     def add_attribute(self, attribute):
         """
diff --git a/src/gen/lib/ldsordbase.py b/src/gen/lib/ldsordbase.py
index 4f96af719..d56e7e8b0 100644
--- a/src/gen/lib/ldsordbase.py
+++ b/src/gen/lib/ldsordbase.py
@@ -68,7 +68,7 @@ class LdsOrdBase(object):
         """
         Convert a serialized tuple of data to an object
         """
-        self.lds_ord_list = map(LdsOrd().unserialize, data)
+        self.lds_ord_list = [LdsOrd().unserialize(item) for item in data]
 
     def add_lds_ord(self, lds_ord):
         """
diff --git a/src/gen/lib/mediabase.py b/src/gen/lib/mediabase.py
index fa1ddb819..e85c1a94c 100644
--- a/src/gen/lib/mediabase.py
+++ b/src/gen/lib/mediabase.py
@@ -60,7 +60,7 @@ class MediaBase(object):
         """
         Convert a serialized tuple of data to an object.
         """
-        self.media_list = map(MediaRef().unserialize, data)
+        self.media_list = [MediaRef().unserialize(item) for item in data]
 
     def add_media_reference(self, media_ref):
         """
diff --git a/src/gen/lib/src.py b/src/gen/lib/src.py
index db17c4fd5..75c64a8c2 100644
--- a/src/gen/lib/src.py
+++ b/src/gen/lib/src.py
@@ -82,7 +82,7 @@ class Source(MediaBase, NoteBase, PrimaryObject):
         self.marker.unserialize(marker)
         NoteBase.unserialize(self, note_list)
         MediaBase.unserialize(self, media_list)
-        self.reporef_list = map(RepoRef().unserialize, reporef_list)
+        self.reporef_list = [RepoRef().unserialize(item) for item in reporef_list]
         
     def _has_handle_reference(self, classname, handle):
         """
diff --git a/src/gen/lib/srcbase.py b/src/gen/lib/srcbase.py
index bd35c8fbf..27a88e5c4 100644
--- a/src/gen/lib/srcbase.py
+++ b/src/gen/lib/srcbase.py
@@ -61,7 +61,7 @@ class SourceBase(object):
         """
         Convert a serialized tuple of data to an object.
         """
-        self.source_list = map(SourceRef().unserialize, data)
+        self.source_list = [SourceRef().unserialize(item) for item in data]
 
     def add_source_reference(self, src_ref) :
         """
diff --git a/src/gen/lib/urlbase.py b/src/gen/lib/urlbase.py
index 7a85fffc3..8f5f33181 100644
--- a/src/gen/lib/urlbase.py
+++ b/src/gen/lib/urlbase.py
@@ -63,7 +63,7 @@ class UrlBase(object):
         """
         Convert a serialized tuple of data to an object.
         """
-        self.urls = map(Url().unserialize, data)
+        self.urls = [Url().unserialize(item) for item in data]
 
     def get_url_list(self):
         """
diff --git a/src/gui/views/treemodels/familymodel.py b/src/gui/views/treemodels/familymodel.py
index e2912ab01..3c5f1f310 100644
--- a/src/gui/views/treemodels/familymodel.py
+++ b/src/gui/views/treemodels/familymodel.py
@@ -129,7 +129,7 @@ class FamilyModel(FlatBaseModel):
         return unicode(gen.lib.FamilyRelType(data[5]))
 
     def column_marriage(self, data):
-        erlist = map(gen.lib.EventRef().unserialize, data[6])
+        erlist = [gen.lib.EventRef().unserialize(item) for item in data[6]]
         erlist = [x for x in erlist if x.get_role()==EventRoleType.FAMILY or 
                                        x.get_role()==EventRoleType.PRIMARY]
         event = self.db.marriage_from_eventref_list(erlist)
@@ -139,7 +139,7 @@ class FamilyModel(FlatBaseModel):
             return u''
 
     def sort_marriage(self, data):
-        erlist = map(gen.lib.EventRef().unserialize, data[6])
+        erlist = [gen.lib.EventRef().unserialize(item) for item in data[6]]
         event = self.db.marriage_from_eventref_list(erlist)
         if event:
             return "%09d" % event.date.get_sort_value()