diff --git a/dbus/DBusMainLoop.cc b/dbus/DBusMainLoop.cc
index 9fcde768..aafc5f20 100644
--- a/dbus/DBusMainLoop.cc
+++ b/dbus/DBusMainLoop.cc
@@ -104,14 +104,12 @@ namespace DBus
 
 	    periodic();
 
+	    for (vector<struct pollfd>::const_iterator it2 = pollfds.begin(); it2 != pollfds.end(); ++it2)
 	    {
-		for (vector<struct pollfd>::const_iterator it2 = pollfds.begin(); it2 != pollfds.end(); ++it2)
+		if (it2->fd == wakeup_pipe[0] && (it2->revents & POLLIN))
 		{
-		    if (it2->fd == wakeup_pipe[0] && (it2->revents & POLLIN))
-		    {
-			char arbitrary;
-			read(wakeup_pipe[0], &arbitrary, 1);
-		    }
+		    char arbitrary;
+		    read(wakeup_pipe[0], &arbitrary, 1);
 		}
 	    }
 
diff --git a/dbus/DBusMainLoop.h b/dbus/DBusMainLoop.h
index 52545767..5ac88010 100644
--- a/dbus/DBusMainLoop.h
+++ b/dbus/DBusMainLoop.h
@@ -51,7 +51,7 @@ namespace DBus
 	virtual int periodic_timeout() = 0;
 	virtual void periodic() = 0;
 
-    protected:
+    private:
 
 	struct Watch
 	{
diff --git a/server/snapperd.cc b/server/snapperd.cc
index b59d3e89..b1ab6eb9 100644
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -193,10 +193,6 @@ main(int argc, char** argv)
     setLogQuery(&log_query);
 #endif
 
-    y2mil("Loading snapper configs");
-
-    meta_snappers.init();
-
     dbus_threads_init_default();
 
     MyMainLoop mainloop(DBUS_BUS_SYSTEM);
@@ -207,6 +203,10 @@ main(int argc, char** argv)
 
     mainloop.request_name(SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING);
 
+    y2mil("Loading snapper configs");
+
+    meta_snappers.init();
+
     y2mil("Listening for method calls and signals");
 
     mainloop.run();