Fix environment variables