diff --git a/aksetup_helper.py b/aksetup_helper.py
index 5dc14139ceaa3fe5cb188e53f75d9e4667f2b308..50507afca8e8af736d51ef154316b6badef69b42 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -285,7 +285,7 @@ class ConfigSchema:
             if value is not None:
                 filevars[key] = value
 
-        keys = filevars.keys()
+        keys = list(filevars.keys())
         keys.sort()
 
         outf = open(filename, "w")
diff --git a/gen_wrap.py b/gen_wrap.py
index 3e5231d7d27a57326f72423386564a3b06324cf5..cbbe940a1921e46675e50af14d8cbb17d7ddbebc 100644
--- a/gen_wrap.py
+++ b/gen_wrap.py
@@ -140,14 +140,16 @@ CLASSES = [
         "basic_set_list", "basic_map_list", "set_list", "map_list",
         "union_set_list",
         "constraint_list",
-        "aff_list", "pw_aff_list",
+        "aff_list", "pw_aff_list", "pw_multi_aff_list",
         "ast_expr_list", "ast_node_list",
+        "pw_qpolynomial_list",
+        "pw_qpolynomial_fold_list",
 
         # maps
         "id_to_ast_expr",
 
         # others
-        "printer",  "val", "multi_val", "vec", "mat",
+        "printer",  "val", "multi_val", "vec", "mat", "fixed_box",
         "aff", "pw_aff", "union_pw_aff",
         "multi_aff", "multi_pw_aff", "pw_multi_aff", "union_pw_multi_aff",
         "union_pw_aff_list",
diff --git a/isl b/isl
index 0ce949a1277de2e3121ed5715bdde639d6f4ba0f..fbdfd06a010f4d19ed863d54f5fa46044c4a59a4 160000
--- a/isl
+++ b/isl
@@ -1 +1 @@
-Subproject commit 0ce949a1277de2e3121ed5715bdde639d6f4ba0f
+Subproject commit fbdfd06a010f4d19ed863d54f5fa46044c4a59a4
diff --git a/setup.py b/setup.py
index 6f273c34ad33727a3de64e111caeccde1621bc83..6cc8bb3e794fd7786c912bc5fdd91d153dc30030 100644
--- a/setup.py
+++ b/setup.py
@@ -130,14 +130,21 @@ def main():
                 "isl_multi_floor.c",
                 "isl_multi_apply_union_set.c",
                 "isl_multi_cmp.c",
+                "isl_multi_pw_aff_explicit_domain.c",
                 "isl_multi_hash.c",
                 "isl_multi_dims.c",
+                "isl_multi_explicit_domain.c",
+                "isl_multi_no_explicit_domain.c",
+                "isl_multi_align_set.c",
+                "isl_multi_align_union_set.c",
+                "isl_multi_union_pw_aff_explicit_domain.c",
                 "isl_union_templ.c",
                 "isl_union_multi.c",
                 "isl_union_eval.c",
                 "isl_union_neg.c",
                 "isl_union_single.c",
                 "isl_pw_hash.c",
+                "isl_pw_eval.c",
                 "isl_pw_union_opt.c",
                 "isl_pw_union_opt.c",
                 ]
diff --git a/test/test_isl.py b/test/test_isl.py
index 28f023d3ca9c90a4260f8852ed501a57f62e2c20..46855df84c812e036d4832eb7235100ec6216f74 100644
--- a/test/test_isl.py
+++ b/test/test_isl.py
@@ -300,6 +300,14 @@ def test_creation_error():
                 "{ [i0, i1, i2] : 0 <= i0 < n1  and 0 and 0 <= i2 <= 15 }")
 
 
+def test_lexmin():
+    print(isl.Set("""{ [s] : exists a,b,c :
+            0 <= a <= 5 and 1 <= b <= 4 and 2 <= c <= 7 and
+            ((2 <= b and b <= 3) implies (a <= 1 or a >= 3)) and
+            ((not (c < 5 or b > 3)) implies (a > 2 and c < 3)) and s = a + b + c }
+            """).lexmin())
+
+
 if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1: