Added further Plone 4.3 compatibility