diff -Nur midori-0.5.12.orig/extensions/adblock/widgets.vala midori-0.5.12/extensions/adblock/widgets.vala
--- midori-0.5.12.orig/extensions/adblock/widgets.vala	2016-09-05 13:45:28.000000000 -0700
+++ midori-0.5.12/extensions/adblock/widgets.vala	2018-06-10 12:11:50.971059162 -0700
@@ -227,7 +227,7 @@
                             liststore.get (iter, 0, out sub);
                             if (sub.mutable) {
                                 config.remove (sub);
-                                liststore.remove (iter);
+                                liststore.remove (ref iter);
                                 return true;
                             }
                         }
diff -Nur midori-0.5.12.orig/extensions/apps.vala midori-0.5.12/extensions/apps.vala
--- midori-0.5.12.orig/extensions/apps.vala	2016-09-05 13:45:28.000000000 -0700
+++ midori-0.5.12/extensions/apps.vala	2018-06-10 12:12:22.496202433 -0700
@@ -262,7 +262,7 @@
                             store.get (iter, 0, out launcher);
                             try {
                                 launcher.file.trash (null);
-                                store.remove (iter);
+                                store.remove (ref iter);
 
                                 string filename = Midori.Download.clean_filename (launcher.name);
 #if HAVE_WIN32
diff -Nur midori-0.5.12.orig/extensions/history-list.vala midori-0.5.12/extensions/history-list.vala
--- midori-0.5.12.orig/extensions/history-list.vala	2016-09-05 13:45:28.000000000 -0700
+++ midori-0.5.12/extensions/history-list.vala	2018-06-10 12:07:24.898821480 -0700
@@ -223,7 +223,7 @@
                     FixMe: the retrun value of `Gtk.ListStore.remove` should be checked
                     Note:  in some cases the return value of `Gtk.ListStore.remove` is wrong
                 */
-                model.remove (iter);
+                model.remove (ref iter);
                 this.browser.close_tab (view);
                 if (length > 2)
                     this.resize_treeview ();
diff -Nur midori-0.5.12.orig/extensions/notes.vala midori-0.5.12/extensions/notes.vala
--- midori-0.5.12.orig/extensions/notes.vala	2016-09-05 13:45:28.000000000 -0700
+++ midori-0.5.12/extensions/notes.vala	2018-06-10 12:07:24.898821480 -0700
@@ -116,7 +116,7 @@
                     if (current_note == note) {
                         current_note = null;
                     }
-                    notes_list_store.remove (iter);
+                    notes_list_store.remove (ref iter);
                     break;
                 }
             } while (notes_list_store.iter_next (ref iter));
diff -Nur midori-0.5.12.orig/extensions/transfers.vala midori-0.5.12/extensions/transfers.vala
--- midori-0.5.12.orig/extensions/transfers.vala	2016-09-05 13:45:28.000000000 -0700
+++ midori-0.5.12/extensions/transfers.vala	2018-06-10 12:07:24.899821485 -0700
@@ -253,7 +253,7 @@
                     Transfer found;
                     store.get (iter, 0, out found);
                     if (transfer == found) {
-                        store.remove (iter);
+                        store.remove (ref iter);
                         break;
                     }
                 } while (store.iter_next (ref iter));
@@ -433,7 +433,7 @@
                 if (notifications.length () == 1)
                     msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
                 else
-                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
+                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, (int) notifications.length ());
                 get_app ().send_notification (_("Transfer completed"), msg);
                 notifications = new GLib.List<string> ();
             }
diff -Nur midori-0.5.12.orig/midori/midori-notebook.vala midori-0.5.12/midori/midori-notebook.vala
--- midori-0.5.12.orig/midori/midori-notebook.vala	2016-09-05 13:45:28.000000000 -0700
+++ midori-0.5.12/midori/midori-notebook.vala	2018-06-10 12:07:24.899821485 -0700
@@ -10,7 +10,7 @@
 */
 
 namespace Midori {
-    protected class Tally : Gtk.EventBox {
+    internal class Tally : Gtk.EventBox {
         public Midori.Tab tab { get; set; }
         Gtk.Spinner spinner;
         public Gtk.Label label;
@@ -22,7 +22,7 @@
         public bool close_button_left { get; set; default = false; }
         public bool close_button_visible { get; set; default = false; }
 
-        protected Tally (Midori.Tab tab) {
+        internal Tally (Midori.Tab tab) {
             this.tab = tab;
             box = new Gtk.HBox (false, 1);
             add (box);
@@ -175,7 +175,7 @@
         int last_tab_size = 0;
 
 #if !HAVE_GTK3
-        static const string style_fixup = """
+        const string style_fixup = """
             style "midori-close-button-style"
             {
             GtkWidget::focus-padding = 0