Get buildout to work properly again