fix some envvars