More fixes for etcd