fix some env vars