Update and fix buildout configuration