Continued tweaking to match OGN's buildout environment