Fixes to etcd commands