consul: Fixing for upstream API changes