more DBUS_GLIB fixes