Update for newer versions of Plone/Zope