diff --git a/sugar/browser/browser.py b/sugar/browser/browser.py
index fc5ce0a1..6a92fbf5 100755
--- a/sugar/browser/browser.py
+++ b/sugar/browser/browser.py
@@ -195,7 +195,7 @@ class BrowserActivity(activity.Activity):
 
 		vbox.show()
 		
-		self._setup_shared(uri)
+		self._setup_shared(self.uri)
 	
 	def get_embed(self):
 		return self.embed
diff --git a/sugar/p2p/Notifier.py b/sugar/p2p/Notifier.py
index 0798999c..ae366e96 100644
--- a/sugar/p2p/Notifier.py
+++ b/sugar/p2p/Notifier.py
@@ -1,5 +1,6 @@
 from sugar.p2p.NotificationListener import NotificationListener
 from sugar.p2p import network
+from sugar.p2p.Service import Service
 
 class Notifier:
 	TYPE = "_olpc_model_notification._udp"
@@ -7,9 +8,8 @@ class Notifier:
 	PORT = 6300
 	
 	def __init__(self, group, name):
-		service = Service(name, NotificationListener.TYPE,
-						  NotificationListener.ADDRESS,
-						  NotificationListener.PORT, True)
+		service = Service(name, Notifier.TYPE, Notifier.ADDRESS,
+						  Notifier.PORT, True)
 		service.register(group)
 
 		address = service.get_address()