Fix some etcd problems