Audience and etcd marshal fix.