Win enumeration tweak