diff --git a/dunst.c b/dunst.c
index 61ee65a..312f561 100644
--- a/dunst.c
+++ b/dunst.c
@@ -1971,7 +1971,7 @@ int main(int argc, char *argv[])
       run(NULL);
       g_main_loop_run(mainloop);
 
-      g_bus_unown_name(owner_id);
+      dbus_tear_down(owner_id);
 
         return 0;
 }
diff --git a/dunst.h b/dunst.h
index e34486f..b86390f 100644
--- a/dunst.h
+++ b/dunst.h
@@ -38,7 +38,7 @@ typedef struct _screen_info {
 
 typedef struct _actions {
         char **actions;
-        int count;
+        gsize count;
 } Actions;
 
 typedef struct _notification {
diff --git a/dunst_dbus.c b/dunst_dbus.c
index 8d243de..2cda50c 100644
--- a/dunst_dbus.c
+++ b/dunst_dbus.c
@@ -325,3 +325,8 @@ int initdbus(void)
 
         return owner_id;
 }
+
+void dbus_tear_down(int owner_id)
+{
+      g_bus_unown_name(owner_id);
+}
diff --git a/dunst_dbus.h b/dunst_dbus.h
index aa1c961..c4db447 100644
--- a/dunst_dbus.h
+++ b/dunst_dbus.h
@@ -6,6 +6,7 @@
 #include <dbus/dbus.h>
 
 int initdbus(void);
+void dbus_tear_down(int id);
 /* void dbus_poll(int timeout); */
 void notificationClosed(notification * n, int reason);