buildout fixes and patches