Fixed detection of zone/kvm