Fix addition of env vars.