diff --git a/browser/configure.zcml b/browser/configure.zcml
index 92746a0..931a0ce 100644
--- a/browser/configure.zcml
+++ b/browser/configure.zcml
@@ -105,7 +105,7 @@
       name="AddLoopsContainer.html"
       for="zope.app.container.interfaces.IAdding"
       class="loops.browser.manager.LoopsAddForm"
-      permission="zope.ManageApplication"
+      permission="zope.ManageSite"
       />
 
   <addMenuItem
@@ -125,7 +125,7 @@
       name="edit.html"
       for="loops.interfaces.ILoops"
       class="loops.browser.manager.LoopsEditForm"
-      permission="zope.ManageApplication"
+      permission="zope.ManageSite"
       menu="zmi_views" title="Edit"
       />
 
diff --git a/configure.zcml b/configure.zcml
index 4400bed..37c76c0 100644
--- a/configure.zcml
+++ b/configure.zcml
@@ -432,10 +432,12 @@
   <!-- utilities -->
 
   <utility
+      provides="cybertools.storage.interfaces.IExternalStorage"
       factory="cybertools.storage.filesystem.instanceVarSubdirectoryStorage"
       name="varsubdir" />
 
   <utility
+      provides="cybertools.storage.interfaces.IExternalStorage"
       factory="cybertools.storage.filesystem.fullPathStorage"
       name="fullpath" />
 
diff --git a/organize/README.txt b/organize/README.txt
index b108dc6..9be3fe0 100644
--- a/organize/README.txt
+++ b/organize/README.txt
@@ -155,7 +155,7 @@ with a principal folder:
   >>> from zope.app.authentication.authentication import PluggableAuthentication
   >>> from zope.app.security.interfaces import IAuthentication
   >>> ensureUtility(site, IAuthentication, '', PluggableAuthentication,
-  ...               copy_to_zlog=False, asObject=True)
+  ...               copy_to_zlog=False)
   <...PluggableAuthentication...>
   >>> pau = component.getUtility(IAuthentication, context=site)
 
diff --git a/organize/configure.zcml b/organize/configure.zcml
index e760a03..c746607 100644
--- a/organize/configure.zcml
+++ b/organize/configure.zcml
@@ -65,11 +65,11 @@
       provides="zope.app.authentication.interfaces.ICredentialsPlugin"
       factory="loops.organize.auth.LoopsSessionCredentialsPlugin" />
 
-  <zope:localUtility class="loops.organize.auth.PersonBasedAuthenticator">
+  <zope:class class="loops.organize.auth.PersonBasedAuthenticator">
     <require
         permission="zope.ManageServices"
         attributes="prefix" />
-  </zope:localUtility>
+  </zope:class>
 
   <!-- other adapters -->
 
diff --git a/organize/tests.py b/organize/tests.py
index 981b6e0..4e9e339 100755
--- a/organize/tests.py
+++ b/organize/tests.py
@@ -50,7 +50,7 @@ def setupObjectsForTesting(site, concepts):
     loopsRoot = concepts.getLoopsRoot()
     setupData = setupUtilitiesAndAdapters(loopsRoot)
     ensureUtility(site, IAuthentication, '', PluggableAuthentication,
-                  copy_to_zlog=False, asObject=True)
+                  copy_to_zlog=False)
     pau = component.getUtility(IAuthentication, context=site)
     # create principal folder and user(s)
     pFolder = PrincipalFolder('users.')
diff --git a/security/configure.zcml b/security/configure.zcml
index dba17bf..7fe3f1a 100644
--- a/security/configure.zcml
+++ b/security/configure.zcml
@@ -16,15 +16,15 @@
 
   <zope:adapter
         for="loops.interfaces.IConcept"
-        factory="zope.app.securitypolicy.rolepermission.AnnotationRolePermissionManager"
+        factory="zope.securitypolicy.rolepermission.AnnotationRolePermissionManager"
         trusted="true" />
   <zope:adapter
         for="loops.interfaces.IResource"
-        factory="zope.app.securitypolicy.rolepermission.AnnotationRolePermissionManager"
+        factory="zope.securitypolicy.rolepermission.AnnotationRolePermissionManager"
         trusted="true" />
   <zope:adapter
         for="loops.interfaces.IView"
-        factory="zope.app.securitypolicy.rolepermission.AnnotationRolePermissionManager"
+        factory="zope.securitypolicy.rolepermission.AnnotationRolePermissionManager"
         trusted="true" />
 
   <zope:adapter factory="loops.security.setter.ConceptSecuritySetter" />
diff --git a/target.py b/target.py
index 43220ab..a1c7cee 100644
--- a/target.py
+++ b/target.py
@@ -23,7 +23,6 @@ resources e.g. from forms that are called on view/node objects.
 $Id$
 """
 
-from zope.app import zapi
 from zope.cachedescriptors.property import Lazy
 from zope.component import adapts
 from zope.i18nmessageid import MessageFactory