Small changes to setenv