Fixes to accomodate the new version of zc.buildout