Some fixes including a change to make things work with Plone 4.3 and pre 1.1 plone.app.contenttypes