Fix and clean buildout