Fix, and environment variables