buildout fixes, cleanups