Fixes

Better compatibility with normal Plone, less breaking if existing functionality such as poup.