final fixes for zope