Import fixes for Plone 4.3b2

Should let PloneFormGen run OK, haven't tested it on an instance though