some fixes for diazo and plone 4.3