Changed/added setenv options