Merged in sauk changes to envvars