Tweaking buildout to match OGN's environment