Added missing env vars