Environment setup script improvements (OPS-7)