Fixed env vars