diff --git a/resources/manager_window.ui b/resources/manager_window.ui
index 83ff3f5..6e2f9fd 100644
--- a/resources/manager_window.ui
+++ b/resources/manager_window.ui
@@ -561,6 +561,8 @@
                 </child>
                 <child>
                   <object class="GtkNotebook" id="properties_notebook">
+                    <property name="width_request">500</property>
+                    <property name="height_request">150</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <signal name="switch-page" handler="on_properties_notebook_switch_page" after="yes" swapped="no"/>
@@ -584,6 +586,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">start</property>
+                                    <property name="margin">6</property>
                                     <property name="selectable">True</property>
                                   </object>
                                   <packing>
@@ -597,6 +600,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">start</property>
+                                    <property name="margin">6</property>
                                     <property name="selectable">True</property>
                                   </object>
                                   <packing>
@@ -611,6 +615,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="has_focus">True</property>
                                     <property name="halign">start</property>
+                                    <property name="margin">6</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -623,6 +628,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">start</property>
+                                    <property name="margin">6</property>
                                     <property name="selectable">True</property>
                                   </object>
                                   <packing>
diff --git a/src/Makefile b/src/Makefile
index b91390a..4fc6d41 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,29 +39,24 @@ clean:
 	rm -f *.c pamac-refresh pamac-daemon pamac-tray pamac-updater pamac-manager pamac-install
 
 pamac-refresh: refresh.vala
-	valac -X -w -X -I/usr/include/glib-2.0 -X -I/usr/lib/glib-2.0/include -X -lglib-2.0  	-o pamac-refresh \
+	valac 	-o pamac-refresh \
 			--pkg=gio-2.0 \
 			refresh.vala
 
-pamac-tray: ../util/alpm-util.c common.vala alpm_config.vala pamac_config.vala tray.vala
-	valac -X -w -X -I/usr/include/glib-2.0 -X -I/usr/lib/glib-2.0/include -X -lglib-2.0  	-o pamac-tray \
+pamac-tray: ../vapi/libalpm.vapi ../util/alpm-util.c common.vala alpm_config.vala pamac_config.vala tray.vala
+	valac 	-o pamac-tray \
+			$(COMMON_VALA_FLAGS) \
+			../util/alpm-util.c \
 			--pkg=posix \
-			--pkg=libalpm \
-			--pkg=gio-2.0 \
 			--pkg=gtk+-3.0 \
 			--pkg=libnotify \
-			--vapidir=../vapi \
-			--Xcc=-I../util \
-			-X -D_FILE_OFFSET_BITS=64 \
-			-X -DGETTEXT_PACKAGE="pamac" \
-			../util/alpm-util.c \
 			common.vala \
 			alpm_config.vala \
 			pamac_config.vala \
 			tray.vala
 
 pamac-daemon: ../vapi/libalpm.vapi ../vapi/polkit-gobject-1.vapi $(COMMON_SOURCES) alpm_config.vala alpm_utils.vala aur.vala daemon.vala
-	valac -X -w -X -I/usr/include/glib-2.0 -X -I/usr/lib/glib-2.0/include -X -lglib-2.0  	-o pamac-daemon \
+	valac 	-o pamac-daemon \
 			$(COMMON_VALA_FLAGS) \
 			--pkg=posix \
 			--pkg=json-glib-1.0 \
@@ -75,7 +70,7 @@ pamac-daemon: ../vapi/libalpm.vapi ../vapi/polkit-gobject-1.vapi $(COMMON_SOURCE
 			daemon.vala
 
 pamac-manager: ../vapi/libalpm.vapi $(COMMON_SOURCES) $(TRANSACTION_SOURCES) choose_dep_dialog.vala history_dialog.vala ../resources/manager_resources.c packages_model.vala manager_window.vala manager.vala
-	valac -X -w -X -I/usr/include/glib-2.0 -X -I/usr/lib/glib-2.0/include -X -lglib-2.0  	-o pamac-manager \
+	valac 	-o pamac-manager \
 			$(COMMON_VALA_FLAGS) \
 			$(TRANSACTION_VALA_FLAGS) \
 			--gresources=$(MANAGER_GRESOURCE_FILE) \
@@ -89,7 +84,7 @@ pamac-manager: ../vapi/libalpm.vapi $(COMMON_SOURCES) $(TRANSACTION_SOURCES) cho
 			manager.vala
 
 pamac-updater: ../vapi/libalpm.vapi $(COMMON_SOURCES) $(TRANSACTION_SOURCES) ../resources/updater_resources.c updater_window.vala updater.vala
-	valac -X -w -X -I/usr/include/glib-2.0 -X -I/usr/lib/glib-2.0/include -X -lglib-2.0  	-o pamac-updater \
+	valac 	-o pamac-updater \
 			$(COMMON_VALA_FLAGS) \
 			$(TRANSACTION_VALA_FLAGS) \
 			--gresources=$(UPDATER_GRESOURCE_FILE) \
@@ -100,7 +95,7 @@ pamac-updater: ../vapi/libalpm.vapi $(COMMON_SOURCES) $(TRANSACTION_SOURCES) ../
 			updater.vala
 
 pamac-install: ../vapi/libalpm.vapi $(COMMON_SOURCES) $(TRANSACTION_SOURCES) ../resources/installer_resources.c installer.vala
-	valac -X -w -X -I/usr/include/glib-2.0 -X -I/usr/lib/glib-2.0/include -X -lglib-2.0  	-o pamac-install \
+	valac 	-o pamac-install \
 			$(COMMON_VALA_FLAGS) \
 			$(TRANSACTION_VALA_FLAGS) \
 			--gresources=$(INSTALLER_GRESOURCE_FILE) \
diff --git a/src/manager_window.vala b/src/manager_window.vala
index 5a9d3f3..307fd25 100644
--- a/src/manager_window.vala
+++ b/src/manager_window.vala
@@ -197,7 +197,7 @@ namespace Pamac {
 		}
 
 		public void show_all_pkgs () {
-			this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+			this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 			transaction.get_all_pkgs.begin ((obj, res) => {
 				var pkgs = transaction.get_all_pkgs.end (res);
 				populate_packages_list (pkgs);
@@ -829,7 +829,7 @@ namespace Pamac {
 		public void on_search_entry_activate () {
 			string search_string = search_entry.get_text ();
 			if (search_string != "") {
-				this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+				this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 				while (Gtk.events_pending ()) {
 					Gtk.main_iteration ();
 				}
@@ -893,7 +893,7 @@ namespace Pamac {
 			Gtk.TreeIter? iter;
 			Gtk.TreeSelection selection = search_treeview.get_selection ();
 			if (selection.get_selected (out model, out iter)) {
-				this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+				this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 				while (Gtk.events_pending ()) {
 					Gtk.main_iteration ();
 				}
@@ -913,7 +913,7 @@ namespace Pamac {
 			Gtk.TreeIter? iter;
 			Gtk.TreeSelection selection = groups_treeview.get_selection ();
 			if (selection.get_selected (out model, out iter)) {
-				this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+				this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 				while (Gtk.events_pending ()) {
 					Gtk.main_iteration ();
 				}
@@ -933,7 +933,7 @@ namespace Pamac {
 			Gtk.TreeIter? iter;
 			Gtk.TreeSelection selection = states_treeview.get_selection ();
 			if (selection.get_selected (out model, out iter)) {
-				this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+				this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 				while (Gtk.events_pending ()) {
 					Gtk.main_iteration ();
 				}
@@ -988,7 +988,7 @@ namespace Pamac {
 			Gtk.TreeIter? iter;
 			Gtk.TreeSelection selection = repos_treeview.get_selection ();
 			if (selection.get_selected (out model, out iter)) {
-				this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+				this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 				while (Gtk.events_pending ()) {
 					Gtk.main_iteration ();
 				}
@@ -1066,7 +1066,7 @@ namespace Pamac {
 					foreach (string path in packages_paths) {
 						transaction.to_load.add (path);
 					}
-					this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+					this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 					chooser.destroy ();
 					while (Gtk.events_pending ()) {
 						Gtk.main_iteration ();
@@ -1102,7 +1102,7 @@ namespace Pamac {
 
 		[GtkCallback]
 		public void on_valid_button_clicked () {
-			this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+			this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 			while (Gtk.events_pending ()) {
 				Gtk.main_iteration ();
 			}
@@ -1119,7 +1119,7 @@ namespace Pamac {
 
 		[GtkCallback]
 		public void on_refresh_button_clicked () {
-			this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+			this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 			while (Gtk.events_pending ()) {
 				Gtk.main_iteration ();
 			}
diff --git a/src/updater_window.vala b/src/updater_window.vala
index 3093dfb..794dd50 100644
--- a/src/updater_window.vala
+++ b/src/updater_window.vala
@@ -70,7 +70,7 @@ namespace Pamac {
 
 		[GtkCallback]
 		public void on_apply_button_clicked () {
-			this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+			this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 			while (Gtk.events_pending ()) {
 				Gtk.main_iteration ();
 			}
@@ -96,7 +96,7 @@ namespace Pamac {
 
 		[GtkCallback]
 		public void on_refresh_button_clicked () {
-			this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+			this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 			while (Gtk.events_pending ()) {
 				Gtk.main_iteration ();
 			}
@@ -113,7 +113,7 @@ namespace Pamac {
 		}
 
 		public async void set_updates_list () {
-			this.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
+			this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 			while (Gtk.events_pending ()) {
 				Gtk.main_iteration ();
 			}
diff --git a/vapi/libalpm.vapi b/vapi/libalpm.vapi
index 3591de4..0017ded 100644
--- a/vapi/libalpm.vapi
+++ b/vapi/libalpm.vapi
@@ -2,7 +2,7 @@
  *  libalpm-vala
  *  Vala bindings for libalpm
  *
- *  Copyright (C) 2014 Guillaume Benoit <guillaume@manjaro.org>
+ *  Copyright (C) 2014-2015 Guillaume Benoit <guillaume@manjaro.org>
  *  Copyright (c) 2011 Rémy Oudompheng <remy@archlinux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -1293,8 +1293,8 @@ namespace Alpm {
 		GPGME
 	}
 
-[CCode (cprefix = "alpm_list_", cheader_filename = "alpm_list.h,alpm-util.h",
-		cname = "alpm_list_t", type_parameters = "G", free_function = "alpm_list_free")]
+[CCode (cname = "alpm_list_t", cprefix = "alpm_list_", cheader_filename = "alpm_list.h,alpm-util.h",
+		free_function = "alpm_list_free")]
 	[Compact]
 	public class List<G> {