Fixing env variables