small additions to make it possible to merge with plone. Shouldn't affect design, I hope