basic buildout fixes