Vendor backports/enumerator for superenv
Enumerator fixes