Fix list of env vars