Adding environment variable fixes