buildout updates and hotfix