A few changes are needed to support the latest version of etcd