fix imports and Plone 4.3 compat