More Plone 4.3 compat updates.