A couple environment updates