Changes to buildout