Fixing two small bugs in env variables