some changes for buildout