Fix bugs in etcd protection against _.