diff --git a/shell/shellservice.py b/shell/shellservice.py
index dcbfc0e6..c31e501b 100644
--- a/shell/shellservice.py
+++ b/shell/shellservice.py
@@ -1,5 +1,7 @@
 import dbus
 
+from sugar.activity import bundleregistry
+
 _DBUS_SERVICE = "org.laptop.Shell"
 _DBUS_INTERFACE = "org.laptop.Shell"
 _DBUS_PATH = "/org/laptop/Shell"
@@ -15,5 +17,5 @@ class ShellService(dbus.service.Object):
         
     @dbus.service.method(_DBUS_INTERFACE, in_signature="s", out_signature="b")
     def add_bundle(self, bundle_path):
-        registry = self._shellModel.get_bundle_registry()
+        registry = bundleregistry.get_registry()
         return registry.add_bundle(bundle_path)
diff --git a/tools/sugar-install-bundle b/tools/sugar-install-bundle
index 0945c29a..971d9743 100755
--- a/tools/sugar-install-bundle
+++ b/tools/sugar-install-bundle
@@ -14,7 +14,7 @@ def get_bundle_root_dir(file_names):
     bundle_root_dir = None
     for file_name in file_names:
         if not bundle_root_dir:
-            bundle_root_dir = file_name.partition('/')[0]
+            bundle_root_dir = file_name.split('/')[0]
             if not bundle_root_dir.endswith('.activity'):
                 raise 'Incorrect bundle.'
         else: