Fix plone bugs.