Improve buildout config.