[WIP] Fix etcd

Intended to fix #20