Changes needed to get Clouseau working on Plone 4.3