updates for buildout2