diff --git a/sugar/browser/Makefile.am b/sugar/browser/Makefile.am
index 5a709c00..7aacdd8a 100644
--- a/sugar/browser/Makefile.am
+++ b/sugar/browser/Makefile.am
@@ -2,12 +2,7 @@ sugardir = $(pythondir)/sugar/browser
 sugar_PYTHON =			\
 	__init__.py		\
 	browser.py		\
-	NotificationBar.py	\
-	BrowserShell.py         \
-	WebActivity.py          \
-	AddressItem.py          \
-	BrowserActivity.py      \
-	NavigationToolbar.py
+	NotificationBar.py	
 
 icondir = $(pkgdatadir)
 icon_DATA =		\
diff --git a/sugar/p2p/presence.py b/sugar/p2p/presence.py
index 9cb297e9..9d11d7e4 100644
--- a/sugar/p2p/presence.py
+++ b/sugar/p2p/presence.py
@@ -1,6 +1,6 @@
 # -*- tab-width: 4; indent-tabs-mode: t -*- 
 
-import avahi, dbus, dbus.glib, dbus.dbus_bindings
+import avahi, dbus, dbus.glib, dbus_bindings
 
 ACTION_SERVICE_NEW = 'new'
 ACTION_SERVICE_REMOVED = 'removed'
@@ -97,7 +97,7 @@ class PresenceAnnounce(object):
 					"", "", # domain, host (let the system figure it out)
 					dbus.UInt16(rs_port), info,)
 			g.Commit()
-		except dbus.dbus_bindings.DBusException, exc:
+		except dbus_bindings.DBusException, exc:
 			# FIXME: ignore local name collisions, since that means
 			# the zeroconf service is already registered.  Ideally we
 			# should un-register it an re-register with the correct info
diff --git a/sugar/shell/Makefile.am b/sugar/shell/Makefile.am
index 387838d7..a768aad6 100644
--- a/sugar/shell/Makefile.am
+++ b/sugar/shell/Makefile.am
@@ -2,5 +2,4 @@ sugardir = $(pythondir)/sugar/shell
 sugar_PYTHON =		\
 	__init__.py	\
 	activity.py	\
-	shell.py        \
-	PresenceWindow.py
+	shell.py
diff --git a/sugar/shell/activity.py b/sugar/shell/activity.py
index 47506d0c..25184446 100644
--- a/sugar/shell/activity.py
+++ b/sugar/shell/activity.py
@@ -246,7 +246,7 @@ class Activity(object):
 		"""Marks this Activity as having changes.  This usually means
 		that this Activity's tab turns a red color or something else
 		to notify the user that this Activity needs attention."""
-		if not self.get_has_focus() and has_changes:
+		if not self.has_focus() and has_changes:
 			self._activity_object.set_has_changes(True)
 		else:
 			self._activity_object.set_has_changes(False)