diff --git a/services/presence/PresenceService.py b/services/presence/PresenceService.py
index 1c3990b8..d466caf9 100644
--- a/services/presence/PresenceService.py
+++ b/services/presence/PresenceService.py
@@ -340,10 +340,10 @@ class PresenceService(object):
 				avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER)
 
 		# Always browse .local
-		self._new_domain_cb(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local")
+		self._new_domain_cb(avahi.IF_UNSPEC, avahi.PROTO_INET, "local")
 
 		# Connect to Avahi and start looking for stuff
-		domain_browser = self._mdns_service.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC,
+		domain_browser = self._mdns_service.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_INET,
 						"", avahi.DOMAIN_BROWSER_BROWSE, dbus.UInt32(0))
 		db = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, domain_browser), avahi.DBUS_INTERFACE_DOMAIN_BROWSER)
 		db.connect_to_signal('ItemNew', self._new_domain_cb_glue)
@@ -573,7 +573,7 @@ class PresenceService(object):
 		# Ask avahi to resolve this particular service
 		path = self._mdns_service.ServiceResolverNew(dbus.Int32(adv.interface()),
 				dbus.Int32(adv.protocol()), adv.name(), adv.stype(), adv.domain(),
-				avahi.PROTO_UNSPEC, dbus.UInt32(0))
+				avahi.PROTO_INET, dbus.UInt32(0))
 		resolver = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, path),
 							avahi.DBUS_INTERFACE_SERVICE_RESOLVER)
 		resolver.connect_to_signal('Found', lambda *args: self._service_resolved_cb_glue(adv, *args))
diff --git a/sugar/activity/Activity.py b/sugar/activity/Activity.py
index 243617a5..16143300 100644
--- a/sugar/activity/Activity.py
+++ b/sugar/activity/Activity.py
@@ -113,6 +113,9 @@ class Activity(gtk.Window):
 		"""Gets the activity type."""
 		return self._activity_type
 
+	def get_default_type(self):
+		return self._default_type
+
 	def get_shared(self):
 		"""Returns TRUE if the activity is shared on the mesh."""
 		return self._shared