few fixes when trying to package almir/plone