Add proper conditionals for the dbus stuff