Fixing Env vars