Fix setup and buildout