--- lib/UX/Models/CollectionModel.vala	2017-06-29 16:17:28.997795458 +0800
+++ lib/UX/Models/CollectionModel.vala	2017-06-29 16:17:22.227415589 +0800
@@ -104,7 +104,7 @@
             return sorted;
         }
 
-        void insert_children (Gee.ArrayList <Filter> groups, Gtk.TreeIter parent) {
+        void insert_children (Gee.ArrayList <Collection> groups, Gtk.TreeIter parent) {
             var sorted = sort_groups(groups);
             foreach(var child in sorted) {
                 Gtk.TreeIter _iter;
--- src/font-manager/State.vala	2017-06-29 16:42:40.268868810 +0800
+++ src/font-manager/State.vala	2017-06-29 16:42:55.579554795 +0800
@@ -25,8 +25,8 @@
 
     public class State : Object {
 
-        internal static const int DEFAULT_WIDTH = 700;
-        internal static const int DEFAULT_HEIGHT = 480;
+        internal const int DEFAULT_WIDTH = 700;
+        internal const int DEFAULT_HEIGHT = 480;
 
         public Settings? settings { get; set; default = null; }
         public weak MainWindow? main_window { get; set; default = null; }
--- src/font-manager/Compare.vala	2017-06-29 16:43:14.080385035 +0800
+++ src/font-manager/Compare.vala	2017-06-29 16:43:31.427831486 +0800
@@ -280,9 +280,17 @@
                  * the iter was always being set to null after calling remove.
                  */
                 string iter_as_string = store.get_string_from_iter(iter);
+#if VALA_0_36
+                store.remove(ref iter);
+#else
                 store.remove(iter);
+#endif
                 store.get_iter_from_string(out iter, iter_as_string);
+#if VALA_0_36
+                bool still_valid = store.remove(ref iter);
+#else
                 bool still_valid = store.remove(iter);
+#endif
                 /* Set the cursor to a remaining row instead of having the cursor disappear.
                  * This allows for easy deletion of multiple previews by hitting the remove
                  * button repeatedly.