Fixing metadta and etcd references.